pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]

Browse Source 
bzr revid: christophe@tinyerp.com-20090811141115-d5sy0wcp5tea6o53
bzr revid: christophe@tinyerp.com-20090812081203-lhman18vsrmhyepg
bzr revid: christophe@tinyerp.com-20090812093104-52gl73glxx90ix39
This commit is contained in:
Christophe Simonis
2009-08-12 11:31:04 +02:00
parent a14e372744 02c5547562
commit 385cd245ef
8 changed files with 297 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/i18n/fr_FR.po
+11 -11
View File
@@ -131,7 +131,7 @@ msgstr "Coefficient multiplicateur"
#: model:ir.actions.wizard,name:account.wizard_unreconcile_select
#: model:ir.ui.menu,name:account.menu_unreconcile_select
msgid "Unreconcile entries"
msgstr "Ecritures non-lettrées"
msgstr "Dé-lettrer les écritures"
#. module: account
#: constraint:account.period:0
@@ -450,7 +450,7 @@ msgstr "Rapprochement bancaire"
#. module: account
#: rml:account.invoice:0
msgid "Disc.(%)"
msgstr ""
msgstr "Rist. (%)"
#. module: account
#: rml:account.general.ledger:0
@@ -928,7 +928,7 @@ msgstr "Compte de débit par défaut"
#: model:ir.actions.act_window,name:account.action_bank_statement_tree
#: model:ir.ui.menu,name:account.menu_bank_statement_tree
msgid "Entries by Statements"
msgstr "Ecritures par état"
msgstr "Ecritures par extrait"
#. module: account
#: model:process.transition,name:account.process_transition_analyticinvoice0
@@ -1701,7 +1701,7 @@ msgstr "Grand livre par période"
#: model:ir.actions.act_window,name:account.action_bank_statement_tree2
#: model:ir.ui.menu,name:account.menu_bank_statement_tree2
msgid "New Statement"
msgstr "Nouvelle déclaration"
msgstr "Nouvel extrait"
#. module: account
#: wizard_field:account.analytic.account.chart,init,from_date:0
@@ -2408,7 +2408,7 @@ msgstr "Début période"
#: model:process.node,name:account.process_node_bankstatement0
#: model:process.node,name:account.process_node_supplierbankstatement0
msgid "Bank Statement"
msgstr "Relevé bancaire"
msgstr "Extrait bancaire"
#. module: account
#: wizard_view:account.invoice.pay,addendum:0
@@ -4674,7 +4674,7 @@ msgstr "Créditeurs"
#: model:ir.actions.wizard,name:account.wizard_balance_report
#: model:ir.ui.menu,name:account.menu_account_balance_report
msgid "Account Balance"
msgstr "Solde du compte"
msgstr "Balance des comptes"
#. module: account
#: model:ir.actions.report.xml,name:account.account_analytic_account_analytic_check
@@ -5221,7 +5221,7 @@ msgstr ":"
#. module: account
#: field:account.bank.statement.line,reconcile_amount:0
msgid "Amount reconciled"
msgstr "Montant réconcilié"
msgstr "Montant lettré"
#. module: account
#: selection:account.account,currency_mode:0
@@ -5308,7 +5308,7 @@ msgstr "Journal Général"
#: rml:account.third_party_ledger:0
#: rml:account.third_party_ledger_other:0
msgid "Balance"
msgstr "Solde de la balance"
msgstr "Balance"
#. module: account
#: rml:account.invoice:0
@@ -5675,7 +5675,7 @@ msgstr "Entrée"
#: model:process.transition,note:account.process_transition_reconcilepaid0
#: model:process.transition,note:account.process_transition_supplierreconcilepaid0
msgid "Paid invoice when reconciled."
msgstr "Facture payé lors du lettrage."
msgstr "Facture payée lors du lettrage."
#. module: account
#: field:account.tax,python_compute_inv:0
@@ -5755,12 +5755,12 @@ msgstr "Positions fiscales"
#. module: account
#: model:process.process,name:account.process_process_statementprocess0
msgid "Statement Process"
msgstr "Processus des Déclaration"
msgstr "Processus de traitement des extraits"
#. module: account
#: model:ir.model,name:account.model_account_bank_statement_reconcile
msgid "Statement reconcile"
msgstr "Réconciliation d'extraits"
msgstr "Lettrage d'extraits"
#. module: account
#: wizard_field:account.fiscalyear.close,init,sure:0
addons/account/report/invoice.rml
+3 -2
View File
@@ -233,7 +233,8 @@
<images/>
<story>
<para style="terp_default_8">[[ repeatIn(objects,'o') ]]</para>
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]]</para>
<para style="terp_default_8">JJJJJ [[ o.partner_id.name ]]</para>
<para style="terp_default_8">[[ setLang(o.partner_id.lang) ]] </para>
<blockTable colWidths="297.0,233.0" style="Table_Partner_Address">
<tr>
<td><para style="P8"><font color="white"> </font></para></td>
@@ -300,7 +301,7 @@
<td><para style="terp_default_Right_9">[[ o.currency_id.code ]]</para></td>
</tr>
<tr>
<td><para style="terp_default_Note">[[ format(l.note or removeParentNode('tr')) ]]</para></td>
<td><para style="terp_default_Note">[[ format(l.note) or removeParentNode('tr') ]]</para></td>
<td><para style="terp_default_Note"><font color="white"> </font></para></td>
<td><para style="terp_default_Note"><font color="white"> </font></para></td>
<td><para style="terp_default_Note"><font color="white"> </font></para></td>
addons/account_invoice_layout/report/report_account_invoice_layout.rml
+7 -7
View File
@@ -126,7 +126,7 @@
<para style="P23">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="P23">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
<para style="P23">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
<para style="P23">Canceled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
<para style="P23">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
<para style="P23">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="P23">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="P16"><font>Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]]</font><font>[[ o.number ]]</font></para>
@@ -163,7 +163,7 @@
</tr>
<tr>
<td><para style="P8"><font color="white"></font></para></td>
<td><para style="terp_default_Note">Note : [[ format(a['note'] or removeParentNode('tr')) ]]</para></td>
<td><para style="terp_default_Note">Note : [[ format(a['note']) or removeParentNode('tr') ]]</para></td>
<td><para style="Table Contents"><font color="white"></font></para></td>
<td><para><font color="white"></font></para></td>
<td><para style="P7"><font color="white"></font></para></td>
@@ -173,8 +173,8 @@
</blockTable>
<blockTable colWidths="453.0,74.0" style="Tableau8">
<tr>
<td><para style="Table Contents">[[ a['type']=='text' and a['name'] or removeParentNode('blockTable') ]]</para></td>
<td><para style="P8">[[ a['type']=='text' and '' or removeParentNode('blockTable') ]]</para></td>
<td><para style="Table Contents">[[ a['type']=='text' and format(a['name']) or removeParentNode('blockTable') ]]</para></td>
<td><para style="P8">[[ a['type']=='text' and '' ]]</para></td>
</tr>
</blockTable>
<pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
@@ -232,7 +232,7 @@
<td><para style="P8">Amount</para></td>
</tr>
<tr>
<td><para style="P11a"><font>[[ repeatIn(o.tax_line,'t') ]]</font>[[ t.name ]]</para></td>
<td><para style="P10"><font>[[ repeatIn(o.tax_line,'t') ]]</font><font>[[ t.name ]]</font></para></td>
<td><para style="P11">[[ '%.2f' % t.base ]]</para></td>
<td><para style="P11">[[ '%.2f' % t.amount]]</para></td>
</tr>
@@ -257,7 +257,7 @@
<para style="P8b">
<font color="white"></font>
</para>
<para style="P19">[[ format(o.comment) or '' ]]</para>
<para style="P19">[[ format(o.payment_term and o.payment_term.note) or '' ]]</para>
<para style="P19">[[ format(o.comment) or removeParentNode('para') ]]</para>
<para style="P19">[[ format(o.payment_term and o.payment_term.note) or removeParentNode('para') ]]</para>
</story>
</document>
addons/account_invoice_layout/report/special_message_invoice.rml
+8 -8
View File
@@ -130,7 +130,7 @@
<para style="P23">Invoice [[ ((o.type == 'out_invoice' and (o.state == 'open' or o.state == 'paid')) or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="P23">PRO-FORMA [[ ((o.type == 'out_invoice' and o.state == 'proforma') or removeParentNode('para')) and '' ]]</para>
<para style="P23">Draft Invoice [[ ((o.type == 'out_invoice' and o.state == 'draft') or removeParentNode('para')) and '' ]]</para>
<para style="P23">Canceled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]]</para>
<para style="P23">Cancelled Invoice [[ ((o.type == 'out_invoice' and o.state == 'cancel') or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="P23">Refund [[ (o.type=='out_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="P23">Supplier Refund [[ (o.type=='in_refund' or removeParentNode('para')) and '' ]] [[ o.number ]]</para>
<para style="P16"><font>Supplier Invoice [[ (o.type=='in_invoice' or removeParentNode('para')) and '' ]]</font><font>[[ o.number ]]</font></para>
@@ -165,7 +165,7 @@
</tr>
<tr>
<td><para style="P8"><font color="white"></font></para></td>
<td><para style="terp_default_Note">Note : [[ format(a['note'] or removeParentNode('tr')) ]]</para></td>
<td><para style="terp_default_Note">Note : [[ format(a['note']) or removeParentNode('tr') ]]</para></td>
<td><para style="Table Contents"><font color="white"></font></para></td>
<td><para><font color="white"></font></para></td>
<td><para style="P7"><font color="white"></font></para></td>
@@ -175,8 +175,8 @@
</blockTable>
<blockTable colWidths="453.0,74.0" style="Tableau8">
<tr>
<td><para style="Table Contents">[[ a['type']=='text' and a['name'] or removeParentNode('blockTable') ]]</para></td>
<td><para style="P8">[[ a['type']=='text' and '' or removeParentNode('blockTable') ]]</para></td>
<td><para style="Table Contents">[[ a['type']=='text' and format(a['name']) or removeParentNode('blockTable') ]]</para></td>
<td><para style="P8">[[ a['type']=='text' and '' ]]</para></td>
</tr>
</blockTable>
<pageBreak>[[ a['type']!='break' and removeParentNode('pageBreak')]]</pageBreak>
@@ -234,7 +234,7 @@
<td><para style="P8">Amount</para></td>
</tr>
<tr>
<td><para style="P11a"><font>[[ repeatIn(o.tax_line,'t') ]]</font>[[ t.name ]]</para></td>
<td><para style="P10"><font>[[ repeatIn(o.tax_line,'t') ]]</font><font>[[ t.name ]]</font></para></td>
<td><para style="P11">[[ '%.2f' % t.base ]]</para></td>
<td><para style="P11">[[ '%.2f' % t.amount]]</para></td>
</tr>
@@ -259,14 +259,14 @@
<para style="P8b">
<font color="white"> </font>
</para>
<para style="P19">[[ format(o.comment) or '' ]]</para>
<para style="P19">[[ format(o.payment_term and o.payment_term.note) or '' ]]</para>
<para style="P19">[[ format(o.comment) or removeParentNode('para') ]]</para>
<para style="P19">[[ format(o.payment_term and o.payment_term.note) or removeParentNode('para') ]]</para>
<para style="P8b">
<font color="white"> </font>
</para>
<section>
<para style="P19">[[ repeatIn((spcl_msg(data['form']) and spcl_msg(data['form']).splitlines()) or [], 'note') ]]</para>
<para style="P19">[[ note or removeParentNode('para') ]]</para>
<para style="P19">[[ format(note) or removeParentNode('para') ]]</para>
</section>
</story>
</document>
addons/mrp/i18n/fr_FR.po
+258 -120
View File
File diff suppressed because it is too large Load Diff
addons/mrp/mrp.py
+8
View File
@@ -483,6 +483,14 @@ class mrp_production(osv.osv):
result = {'product_uom':uom}
return {'value':result}
def bom_id_change(self, cr, uid, ids, product):
if not product:
return {}
res = self.pool.get('mrp.bom').read(cr, uid, [product], ['routing_id'])[0]
routing_id = res['routing_id'] and res['routing_id'][0]
result = {'routing_id':routing_id}
return {'value':result}
def action_picking_except(self, cr, uid, ids):
self.write(cr, uid, ids, {'state':'picking_except'})
return True
addons/mrp/mrp_view.xml
+1 -1
View File
@@ -464,7 +464,7 @@
<page string="Consumed Products">
<field name="location_src_id" select="2" domain="[('usage','=','internal')]" on_change="location_id_change(location_src_id,location_dest_id)"/>
<field name="location_dest_id" domain="[('usage','=','internal')]"/>
<field name="bom_id" select="2" domain="[('product_id','=',product_id),('bom_id','=',False)]"/>
<field name="bom_id" select="2" domain="[('product_id','=',product_id),('bom_id','=',False)]" on_change="bom_id_change(bom_id)"/>
<field name="routing_id" groups="base.group_extended" select="1"/>
<newline/>
<field colspan="4" name="move_lines" nolabel="1" widget="one2many_list"/>
addons/stock/wizard/wizard_location_product.py
+1 -1
View File
@@ -45,7 +45,7 @@ class product_by_location(wizard.interface):
<field name="to_date"/>
<newline/>
<label string=""/>
<label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day)" align="0.0" colspan="3"/>
<label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)" align="0.0" colspan="3"/>
</form>'''
form1_fields = {
'from_date': {