From 72effa3f25b2e6495ee7893c59ef53bb787a2c1c Mon Sep 17 00:00:00 2001 From: fhenry Date: Fri, 15 Mar 2013 09:31:11 +0100 Subject: [PATCH 1/8] Fix part of bugs [ bug #766 ] --- htdocs/admin/expedition.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php index 709832b1968..2349053f46f 100644 --- a/htdocs/admin/expedition.php +++ b/htdocs/admin/expedition.php @@ -65,9 +65,9 @@ if ($action == 'updateMask') if (isset($res)) { if ($res < 0) - setEventMessage($langs->trans("SetupSaved")); - else setEventMessage($langs->trans("Error"), 'errors'); + else + setEventMessage($langs->trans("SetupSaved")); } } @@ -77,9 +77,9 @@ else if ($action == 'set_SHIPPING_FREE_TEXT') $res = dolibarr_set_const($db, "SHIPPING_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity); if ($res < 0) - setEventMessage($langs->trans("SetupSaved")); - else setEventMessage($langs->trans("Error"), 'errors'); + else + setEventMessage($langs->trans("SetupSaved")); } else if ($action == 'set_SHIPPING_DRAFT_WATERMARK') @@ -88,9 +88,9 @@ else if ($action == 'set_SHIPPING_DRAFT_WATERMARK') $res = dolibarr_set_const($db, "SHIPPING_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity); if ($res < 0) - setEventMessage($langs->trans("SetupSaved")); - else setEventMessage($langs->trans("Error"), 'errors'); + else + setEventMessage($langs->trans("SetupSaved")); } else if ($action == 'specimen') @@ -173,7 +173,12 @@ else if ($action == 'setdoc') else if ($action == 'setmodel') { - dolibarr_set_const($db, "EXPEDITION_ADDON_NUMBER",$value,'chaine',0,'',$conf->entity); + $res = dolibarr_set_const($db, "EXPEDITION_ADDON_NUMBER",$value,'chaine',0,'',$conf->entity); + + if ($res < 0) + setEventMessage($langs->trans("Error"), 'errors'); + else + setEventMessage($langs->trans("SetupSaved")); } From 010207532f2d9c6cacb0d32addbed483899b9bf0 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Fri, 15 Mar 2013 10:12:40 +0100 Subject: [PATCH 2/8] fix trad --- htdocs/langs/en_US/admin.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 599b8c69ef7..1554fcede0f 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -998,7 +998,7 @@ WebCalCheckWebcalSetup=Maybe the Webcal module setup is not correct. ##### Invoices ##### BillsSetup=Invoices module setup BillsDate=Invoices date -BillsNumberingModule=Invoices and credit notes numbering module +BillsNumberingModule=Invoices and credit notes numbering model BillsPDFModules=Invoice documents models CreditNoteSetup=Credit note module setup CreditNotePDFModules=Credit note document models From 95c9d19d5eb8e41f86e5818ec96b11c63584e584 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 15 Mar 2013 11:31:49 +0100 Subject: [PATCH 3/8] Fix: Restore ability to filter on '0' --- htdocs/exports/class/export.class.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php index 622f26506f9..07199f815d8 100644 --- a/htdocs/exports/class/export.class.php +++ b/htdocs/exports/class/export.class.php @@ -233,8 +233,7 @@ class Export // pour ne pas a gerer le nombre de condition foreach ($array_filterValue as $key => $value) { - if (!empty($value)) - $sqlWhere.=" and ".$this->build_filterQuery($this->array_export_TypeFields[0][$key], $key, $array_filterValue[$key]); + if ($value != '') $sqlWhere.=" and ".$this->build_filterQuery($this->array_export_TypeFields[0][$key], $key, $array_filterValue[$key]); } $sql.=$sqlWhere; } @@ -248,7 +247,7 @@ class Export * * @param string $TypeField Type of Field to filter * @param string $NameField Name of the field to filter - * @param string $ValueField Initial value of the field to filter + * @param string $ValueField Value of the field for filter. Must not be '' * @return string sql string of then field ex : "field='xxx'>" */ function build_filterQuery($TypeField, $NameField, $ValueField) From 36e99e100b0641109de62ea7ee478c1d5cd403bf Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Fri, 15 Mar 2013 12:13:23 +0100 Subject: [PATCH 4/8] fix trad --- htdocs/langs/ar_SA/bills.lang | 2 +- htdocs/langs/bg_BG/bills.lang | 2 +- htdocs/langs/da_DK/bills.lang | 2 +- htdocs/langs/el_GR/bills.lang | 2 +- htdocs/langs/en_US/bills.lang | 4 ++-- htdocs/langs/et_EE/bills.lang | 2 +- htdocs/langs/fi_FI/bills.lang | 2 +- htdocs/langs/he_IL/bills.lang | 2 +- htdocs/langs/hu_HU/bills.lang | 2 +- htdocs/langs/is_IS/bills.lang | 2 +- htdocs/langs/ja_JP/bills.lang | 2 +- htdocs/langs/nb_NO/bills.lang | 2 +- htdocs/langs/nl_NL/bills.lang | 2 +- htdocs/langs/pl_PL/bills.lang | 2 +- htdocs/langs/ro_RO/bills.lang | 2 +- htdocs/langs/sv_SE/bills.lang | 2 +- htdocs/langs/zh_CN/bills.lang | 2 +- htdocs/langs/zh_TW/bills.lang | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang index 6fad3e67919..3987e77682f 100644 --- a/htdocs/langs/ar_SA/bills.lang +++ b/htdocs/langs/ar_SA/bills.lang @@ -433,6 +433,6 @@ EditGlobalDiscounts=تعديل الخصومات مطلق AddCreditNote=علما خلق الائتمان InvoiceNotChecked=لا فاتورة مختارة ShowUnpaidAll=وتظهر جميع الفواتير غير المسددة -ClosePaidInvoicesAutomatically=تصنيف "سيولي" كل معيار أو الفواتير استبدال سيولي entierely. +ClosePaidInvoicesAutomatically=تصنيف "سيولي" كل معيار أو الفواتير استبدال سيولي entirely. AllCompletelyPayedInvoiceWillBeClosed=كل فاتورة مع عدم وجود لا تزال لدفع ستغلق تلقائيا إلى "فياض" الوضع. // STOP - Lines generated via autotranslator.php tool (2012-02-29 15:56:17). diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang index 86920ad6d7d..9d295d4edc5 100644 --- a/htdocs/langs/bg_BG/bills.lang +++ b/htdocs/langs/bg_BG/bills.lang @@ -384,7 +384,7 @@ DisabledBecausePayments=Не е възможно, тъй като има няк CantRemovePaymentWithOneInvoicePaid=Не може да се премахне плащането, тъй като има най-малко една фактура, класифицирани плаща ExpectedToPay=Очаквано плащане PayedByThisPayment=Плаща от това плащане -ClosePaidInvoicesAutomatically=Класифицира "ЗАПЛАЩАТ" стандартно или заместващи фактури entierely ЗАПЛАЩАТ. +ClosePaidInvoicesAutomatically=Класифицира "ЗАПЛАЩАТ" стандартно или заместващи фактури entirely ЗАПЛАЩАТ. AllCompletelyPayedInvoiceWillBeClosed=Всички фактура не остават да плати, ще бъде затворено автоматично статус "Платени". TypeContact_facture_internal_SALESREPFOLL=Представител проследяване клиент фактура TypeContact_facture_external_BILLING=Контакта с клиентите фактура diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang index f915134e890..f357cb6bec2 100644 --- a/htdocs/langs/da_DK/bills.lang +++ b/htdocs/langs/da_DK/bills.lang @@ -433,6 +433,6 @@ EditGlobalDiscounts=Rediger absolutte rabatter AddCreditNote=Opret kreditnota InvoiceNotChecked=Ingen valgt faktura ShowUnpaidAll=Vis alle ubetalte fakturaer -ClosePaidInvoicesAutomatically=Klassificere "betales" hele standarden eller udskiftning af fakturaer entierely betales. +ClosePaidInvoicesAutomatically=Klassificere "betales" hele standarden eller udskiftning af fakturaer entirely betales. AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uden mangler at betale, vil automatisk blive lukket for status "betales". // STOP - Lines generated via autotranslator.php tool (2012-02-29 16:00:06). diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang index e38fd849716..30bd5669898 100644 --- a/htdocs/langs/el_GR/bills.lang +++ b/htdocs/langs/el_GR/bills.lang @@ -419,7 +419,7 @@ AddGlobalDiscount=Προσθήκη έκπτωσης AddCreditNote=Δημιουργία πιστωτικό σημείωμα InvoiceNotChecked=Δεν έχει επιλεγεί τιμολόγιο ShowUnpaidAll=Εμφάνιση όλων των απλήρωτων τιμολογίων -ClosePaidInvoicesAutomatically=Ταξινομήστε "Πληρωμένες» όλα τα τιμολόγια entierely payed. +ClosePaidInvoicesAutomatically=Ταξινομήστε "Πληρωμένες» όλα τα τιμολόγια entirely payed. AllCompletelyPayedInvoiceWillBeClosed=Όλα τιμολόγιο χωρίς παραμένουν να πληρώσουν θα κλείσει αυτόματα σε κατάσταση "Πληρωμένες». // STOP - Lines generated via autotranslator.php tool (2011-06-26 15:36:46). diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang index 6928bc1a603..78179acd8c9 100644 --- a/htdocs/langs/en_US/bills.lang +++ b/htdocs/langs/en_US/bills.lang @@ -384,8 +384,8 @@ DisabledBecausePayments=Not possible since there is some payments CantRemovePaymentWithOneInvoicePaid=Can't remove payment since there is at least one invoice classified payed ExpectedToPay=Expected payment PayedByThisPayment=Payed by this payment -ClosePaidInvoicesAutomatically=Classify "Payed" all standard or replacement invoices entierely payed. -ClosePaidCreditNotesAutomatically=Classify "Payed" all credit notes entierely paid back. +ClosePaidInvoicesAutomatically=Classify "Payed" all standard or replacement invoices entirely payed. +ClosePaidCreditNotesAutomatically=Classify "Payed" all credit notes entirely paid back. AllCompletelyPayedInvoiceWillBeClosed=All invoice with no remain to pay will be automatically closed to status "Payed". ToMakePayment=Pay ToMakePaymentBack=Pay back diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang index 6b7f9cfc53e..b2b9a21de61 100644 --- a/htdocs/langs/et_EE/bills.lang +++ b/htdocs/langs/et_EE/bills.lang @@ -374,7 +374,7 @@ DisabledBecausePayments=Ole võimalik, sest seal on mõned maksed CantRemovePaymentWithOneInvoicePaid=Ei saa eemaldada makse sest seal on vähemalt üks arve klassifitseeritud payed ExpectedToPay=Oodatud makse PayedByThisPayment=Payed selle makse -ClosePaidInvoicesAutomatically=Liigitada "payed" kõik standard või asendamine arved entierely payed. +ClosePaidInvoicesAutomatically=Liigitada "payed" kõik standard või asendamine arved entirely payed. AllCompletelyPayedInvoiceWillBeClosed=Kõik arve, millel ei ole veel maksma automaatselt suletud olek "payed". TypeContact_facture_internal_SALESREPFOLL=Esindaja järelmeetmeid kliendi arve TypeContact_facture_external_BILLING=Kliendi arve kontaktandmed diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang index 9c383ea1fde..c56954a7b96 100644 --- a/htdocs/langs/fi_FI/bills.lang +++ b/htdocs/langs/fi_FI/bills.lang @@ -431,6 +431,6 @@ EditGlobalDiscounts=Muokkaa absoluuttinen alennukset AddCreditNote=Luo hyvityslasku InvoiceNotChecked=Ei laskun valittu ShowUnpaidAll=Näytä kaikki maksamattomat laskut -ClosePaidInvoicesAutomatically=Luokittele "maksanut" kaikki vakio-tai korvaavan laskuja entierely maksanut. +ClosePaidInvoicesAutomatically=Luokittele "maksanut" kaikki vakio-tai korvaavan laskuja entirely maksanut. AllCompletelyPayedInvoiceWillBeClosed=Kaikki lasku ilman jää maksaa automaattisesti suljettu tila "maksanut". // STOP - Lines generated via autotranslator.php tool (2012-02-29 16:11:08). diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang index d0c5cb1044c..a16a4c45547 100644 --- a/htdocs/langs/he_IL/bills.lang +++ b/htdocs/langs/he_IL/bills.lang @@ -374,7 +374,7 @@ DisabledBecausePayments=לא ניתן שכן אין תשלומים מסוימי CantRemovePaymentWithOneInvoicePaid=לא ניתן להסיר תשלום מאז יש לפחות חשבונית אחת מסווגים שילם ExpectedToPay=צפוי התשלום PayedByThisPayment=שילם על ידי תשלום זה -ClosePaidInvoicesAutomatically=לסווג "שילם" את כל תקן או חשבוניות החלפת שילם entierely. +ClosePaidInvoicesAutomatically=לסווג "שילם" את כל תקן או חשבוניות החלפת שילם entirely. AllCompletelyPayedInvoiceWillBeClosed=כל חשבונית ללא להישאר לשלם ייסגר באופן אוטומטי למצב "שילם". TypeContact_facture_internal_SALESREPFOLL=לקוחות נציג הבאה למעלה החשבונית TypeContact_facture_external_BILLING=חשבונית הלקוח קשר diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang index 8546d155e7b..4439698118d 100644 --- a/htdocs/langs/hu_HU/bills.lang +++ b/htdocs/langs/hu_HU/bills.lang @@ -374,7 +374,7 @@ DisabledBecausePayments=Nem lehetséges, mert van némi kifizetések CantRemovePaymentWithOneInvoicePaid=Nem lehet eltávolítani a fizetési hiszen legalább egy számlát fizetni osztályozott ExpectedToPay=Várható fizetés PayedByThisPayment=Megfizetni ezt a fizetési -ClosePaidInvoicesAutomatically=Classify "fizetni" minden szabványos vagy csere számlák entierely fizetni. +ClosePaidInvoicesAutomatically=Classify "fizetni" minden szabványos vagy csere számlák entirely fizetni. AllCompletelyPayedInvoiceWillBeClosed=Minden számla nélkül is fizetni fogják automatikusan bezárja az állapota "fizetni". TypeContact_facture_internal_SALESREPFOLL=Reprezentatív nyomon követése vevőszámla TypeContact_facture_external_BILLING=Ügyfél számla Kapcsolat diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang index 21209b0158f..a342ad46e78 100644 --- a/htdocs/langs/is_IS/bills.lang +++ b/htdocs/langs/is_IS/bills.lang @@ -410,6 +410,6 @@ EditGlobalDiscounts=Breyta hreinum afslætti AddCreditNote=Búa inneignarnótuna InvoiceNotChecked=Engin reikningur valinn ShowUnpaidAll=Sýna alla ógreiddra reikninga -ClosePaidInvoicesAutomatically=Flokka "borgað" allt staðall eða skipti reikningar entierely borgað. +ClosePaidInvoicesAutomatically=Flokka "borgað" allt staðall eða skipti reikningar entirely borgað. AllCompletelyPayedInvoiceWillBeClosed=Allt Reikningar með ekki áfram að borga verður sjálfkrafa lokað til stöðu "borgað". // STOP - Lines generated via autotranslator.php tool (2012-02-29 16:27:05). diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang index f2172127b5f..e8088302025 100644 --- a/htdocs/langs/ja_JP/bills.lang +++ b/htdocs/langs/ja_JP/bills.lang @@ -374,7 +374,7 @@ DisabledBecausePayments=いくつかの支払いがあるのでできませ​ CantRemovePaymentWithOneInvoicePaid=支払った分類少なくとも一つの請求書があるので支払いを削除することはできません ExpectedToPay=予想される支払い PayedByThisPayment=この支払によって支払った -ClosePaidInvoicesAutomatically="支払った"すべての標準またはentierely支払った交換用の請求書を分類します。 +ClosePaidInvoicesAutomatically="支払った"すべての標準またはentirely支払った交換用の請求書を分類します。 AllCompletelyPayedInvoiceWillBeClosed=を持たないすべての請求書は自動的にステータスが "支払った"に閉鎖され支払うことに残っています。 TypeContact_facture_internal_SALESREPFOLL=代表的なフォローアップ顧客の請求書 TypeContact_facture_external_BILLING=顧客の請求書の連絡先 diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang index faf0e2b69b4..1a3618b132c 100644 --- a/htdocs/langs/nb_NO/bills.lang +++ b/htdocs/langs/nb_NO/bills.lang @@ -438,6 +438,6 @@ EditGlobalDiscounts=Rediger absolutte rabatter AddCreditNote=Lag kreditt notat InvoiceNotChecked=Ingen faktura er valgt ShowUnpaidAll=Vis alle ubetalte fakturaer -ClosePaidInvoicesAutomatically=Klassifisere "betalt" alle standard eller utskifting fakturaer entierely utbetales. +ClosePaidInvoicesAutomatically=Klassifisere "betalt" alle standard eller utskifting fakturaer entirely utbetales. AllCompletelyPayedInvoiceWillBeClosed=Alle faktura uten gjenstår å betale vil bli automatisk stengt for status "betales". // STOP - Lines generated via autotranslator.php tool (2012-02-29 17:07:28). diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang index d8d7bae1abe..bc238882ecc 100644 --- a/htdocs/langs/nl_NL/bills.lang +++ b/htdocs/langs/nl_NL/bills.lang @@ -400,7 +400,7 @@ EditGlobalDiscounts=Edit absolute kortingen AddCreditNote=Maak een credit nota AllCompletelyPayedInvoiceWillBeClosed=Alle factuur zonder te blijven om te betalen zal automatisch worden gesloten om status "Betaald". TerreNumRefModelError=Een wetsvoorstel te beginnen met $ syymm bestaat al en is niet compatibel met dit model van de reeks. Verwijderen of hernoemen naar deze module te activeren. -ClosePaidInvoicesAutomatically=Classificeren "Betaalde" alle standaard of vervanging facturen entierely betaald. +ClosePaidInvoicesAutomatically=Classificeren "Betaalde" alle standaard of vervanging facturen entirely betaald. // STOP - Lines generated via autotranslator.php tool (2011-10-10 02:25:52). diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang index 422892976c9..549154c32e2 100644 --- a/htdocs/langs/pl_PL/bills.lang +++ b/htdocs/langs/pl_PL/bills.lang @@ -432,6 +432,6 @@ EditGlobalDiscounts=Edytuj bezwzględne zniżki AddCreditNote=Tworzenie noty kredytowej InvoiceNotChecked=Nie wybrano faktura ShowUnpaidAll=Pokaż wszystkie niezapłacone faktury -ClosePaidInvoicesAutomatically=Klasyfikowanie "Opłacone" wszystkie standardy lub fakturach zastępczych entierely zapłaci. +ClosePaidInvoicesAutomatically=Klasyfikowanie "Opłacone" wszystkie standardy lub fakturach zastępczych entirely zapłaci. AllCompletelyPayedInvoiceWillBeClosed=Wszystko faktura bez pozostawać do zapłaty zostanie automatycznie zamknięta do statusu "płatny". // STOP - Lines generated via autotranslator.php tool (2012-02-29 17:19:17). diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang index e0042ad162b..aa7e69936e3 100644 --- a/htdocs/langs/ro_RO/bills.lang +++ b/htdocs/langs/ro_RO/bills.lang @@ -432,6 +432,6 @@ EditGlobalDiscounts=Editare reduceri absolute AddCreditNote=Creaţi note de credit InvoiceNotChecked=Nu factură selectat ShowUnpaidAll=Arata toate facturile neachitate -ClosePaidInvoicesAutomatically=Clasifica "platiti", toate facturile standard sau de înlocuire entierely platite. +ClosePaidInvoicesAutomatically=Clasifica "platiti", toate facturile standard sau de înlocuire entirely platite. AllCompletelyPayedInvoiceWillBeClosed=Toate cu factura nu rămân la plata vor fi închise automat la statutul de "platite". // STOP - Lines generated via autotranslator.php tool (2012-02-29 17:24:55). diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang index 2b477bb3084..7d60a306554 100644 --- a/htdocs/langs/sv_SE/bills.lang +++ b/htdocs/langs/sv_SE/bills.lang @@ -409,6 +409,6 @@ EditGlobalDiscounts=Redigera absoluta rabatter AddCreditNote=Skapa kreditnota InvoiceNotChecked=Faktura vald ShowUnpaidAll=Visa alla obetalda fakturor -ClosePaidInvoicesAutomatically=Klassificera "betalade" alla standard eller fakturor ersättning entierely betalt. +ClosePaidInvoicesAutomatically=Klassificera "betalade" alla standard eller fakturor ersättning entirely betalt. AllCompletelyPayedInvoiceWillBeClosed=Alla fakturor utan återstår att betala kommer automatiskt stängd för status "betald". // STOP - Lines generated via autotranslator.php tool (2012-02-29 17:32:49). diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang index d3330a6a431..ad61aa5068e 100644 --- a/htdocs/langs/zh_CN/bills.lang +++ b/htdocs/langs/zh_CN/bills.lang @@ -414,6 +414,6 @@ EditGlobalDiscounts=编辑绝对折扣 AddCreditNote=创建信用票据 InvoiceNotChecked=选择无发票 ShowUnpaidAll=显示所有未付发票 -ClosePaidInvoicesAutomatically=分类“支付最高”的所有entierely支付最高标准或更换发票。 +ClosePaidInvoicesAutomatically=分类“支付最高”的所有entirely支付最高标准或更换发票。 AllCompletelyPayedInvoiceWillBeClosed=所有发票仍然没有支付将被自动关闭状态“支付最高”。 // STOP - Lines generated via autotranslator.php tool (2012-02-29 17:38:07). diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang index 399aa502b29..ae3bfa163ad 100644 --- a/htdocs/langs/zh_TW/bills.lang +++ b/htdocs/langs/zh_TW/bills.lang @@ -414,6 +414,6 @@ EditGlobalDiscounts=編輯絕對折扣 AddCreditNote=創建信用票據 InvoiceNotChecked=選擇無發票 ShowUnpaidAll=顯示所有未付款的發票 -ClosePaidInvoicesAutomatically=分類“支付最高”的所有entierely支付最高標準或更換發票。 +ClosePaidInvoicesAutomatically=分類“支付最高”的所有entirely支付最高標準或更換發票。 AllCompletelyPayedInvoiceWillBeClosed=所有發票仍然沒有支付將被自動關閉狀態“支付最高”。 // STOP - Lines generated via autotranslator.php tool (2012-02-29 17:38:07). From c0e5cacafcb9cfa31c77d38e19936a3473f6f3ab Mon Sep 17 00:00:00 2001 From: simnandez Date: Fri, 15 Mar 2013 16:18:14 +0100 Subject: [PATCH 5/8] Fix: Bad orders list viewstatut filter if expeditons module is disabled --- htdocs/core/menus/standard/eldy.lib.php | 2 +- htdocs/index.php | 2 +- htdocs/langs/ca_ES/orders.lang | 2 +- htdocs/langs/es_ES/orders.lang | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 7ce259573be..e33c307d367 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -857,7 +857,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire); if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire); if ($leftmenu=="orders" && ! empty($conf->expedition->enabled)) $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=2", $langs->trans("StatusOrderOnProcessShort"), 2, $user->rights->commande->lire); - if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=".($conf->expedition->enabled?"3":"-2"), $langs->trans("StatusOrderToBill"), 2, $user->rights->commande->lire); + if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=".($conf->expedition->enabled?"3":"-3"), $langs->trans("StatusOrderToBill"), 2, $user->rights->commande->lire); if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire); if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire); $newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire); diff --git a/htdocs/index.php b/htdocs/index.php index bb5a6bf8178..b42117e1c3b 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -308,7 +308,7 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) $board->load_board($user); $board->warning_delay=$conf->commande->client->warning_delay/60/60/24; $board->label=$langs->trans("OrdersToProcess"); - $board->url=DOL_URL_ROOT.'/commande/liste.php?viewstatut=-2'; + $board->url=DOL_URL_ROOT.'/commande/liste.php?viewstatut=-3'; $board->img=img_object($langs->trans("Orders"),"order"); $rowspan++; $dashboardlines[]=$board; diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang index 15fd9b6c9a1..c63981ccf2e 100644 --- a/htdocs/langs/ca_ES/orders.lang +++ b/htdocs/langs/ca_ES/orders.lang @@ -28,7 +28,7 @@ SuppliersOrdersToProcess=Comandes a proveïdors a processar StatusOrderCanceledShort=Anul·lada StatusOrderDraftShort=Esborrany StatusOrderValidatedShort=Validada -StatusOrderOnProcessShort=Per rebre +StatusOrderOnProcessShort=En procés StatusOrderSentShort=Expedició en curs StatusOrderSent=Enviament en curs StatusOrderProcessedShort=Processada diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang index 13710c240b7..51bfbd082a2 100644 --- a/htdocs/langs/es_ES/orders.lang +++ b/htdocs/langs/es_ES/orders.lang @@ -28,7 +28,7 @@ SuppliersOrdersToProcess=Pedidos a proveedores a procesar StatusOrderCanceledShort=Anulado StatusOrderDraftShort=Borrador StatusOrderValidatedShort=Validado -StatusOrderOnProcessShort=Pdte. Recibir +StatusOrderOnProcessShort=En proceso StatusOrderSentShort=Expedición en curso StatusOrderSent=Envío en curso StatusOrderProcessedShort=Procesado From 1a62cdfbe85a5af570827932a370c3bae765142a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 15 Mar 2013 17:06:42 +0100 Subject: [PATCH 6/8] Fix: Use better test to show localtax to avoid problem when switching from different country. --- .../core/modules/commande/doc/pdf_einstein.modules.php | 10 ++++------ htdocs/core/modules/facture/doc/pdf_crabe.modules.php | 10 ++++------ htdocs/core/modules/propale/doc/pdf_azur.modules.php | 10 ++++------ 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index ffb2b7fc1be..f13af05b108 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -378,10 +378,8 @@ class pdf_einstein extends ModelePDFCommandes // TODO : store local taxes types into object lines and remove this $localtax1_array=getLocalTaxesFromRate($vatrate,1,$mysoc); $localtax2_array=getLocalTaxesFromRate($vatrate,2,$mysoc); - if (empty($localtax1_type)) - $localtax1_type = $localtax1_array[0]; - if (empty($localtax2_type)) - $localtax2_type = $localtax2_array[0]; + if (! isset($localtax1_type)) $localtax1_type = $localtax1_array[0]; + if (! isset($localtax2_type)) $localtax2_type = $localtax2_array[0]; //end TODO // retrieve global local tax @@ -390,9 +388,9 @@ class pdf_einstein extends ModelePDFCommandes if ($localtax2_type == '7') $localtax2_rate = $localtax2_array[1]; - if ($localtax1ligne != 0 || $localtax1_type == '7') + if ($localtax1_type && ($localtax1ligne != 0 || $localtax1_type == '7')) $this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne; - if ($localtax2ligne != 0 || $localtax2_type == '7') + if ($localtax2_type && ($localtax2ligne != 0 || $localtax2_type == '7')) $this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne; if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*'; diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 7b46fe6e5a5..d5cafd460c2 100755 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -380,10 +380,8 @@ class pdf_crabe extends ModelePDFFactures // TODO : store local taxes types into object lines and remove this $localtax1_array=getLocalTaxesFromRate($vatrate,1,$mysoc); $localtax2_array=getLocalTaxesFromRate($vatrate,2,$mysoc); - if (empty($localtax1_type)) - $localtax1_type = $localtax1_array[0]; - if (empty($localtax2_type)) - $localtax2_type = $localtax2_array[0]; + if (! isset($localtax1_type)) $localtax1_type = $localtax1_array[0]; + if (! isset($localtax2_type)) $localtax2_type = $localtax2_array[0]; //end TODO // retrieve global local tax @@ -392,9 +390,9 @@ class pdf_crabe extends ModelePDFFactures if ($localtax2_type == '7') $localtax2_rate = $localtax2_array[1]; - if ($localtax1ligne != 0 || $localtax1_type == '7') + if ($localtax1_type && ($localtax1ligne != 0 || $localtax1_type == '7')) $this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne; - if ($localtax2ligne != 0 || $localtax2_type == '7') + if ($localtax2_type && ($localtax2ligne != 0 || $localtax2_type == '7')) $this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne; if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*'; diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index 6c481063086..b62a6fe01f6 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -375,10 +375,8 @@ class pdf_azur extends ModelePDFPropales // TODO : store local taxes types into object lines and remove this $localtax1_array=getLocalTaxesFromRate($vatrate,1,$mysoc); $localtax2_array=getLocalTaxesFromRate($vatrate,2,$mysoc); - if (empty($localtax1_type)) - $localtax1_type = $localtax1_array[0]; - if (empty($localtax2_type)) - $localtax2_type = $localtax2_array[0]; + if (! isset($localtax1_type)) $localtax1_type = $localtax1_array[0]; + if (! isset($localtax2_type)) $localtax2_type = $localtax2_array[0]; //end TODO // retrieve global local tax @@ -387,9 +385,9 @@ class pdf_azur extends ModelePDFPropales if ($localtax2_type == '7') $localtax2_rate = $localtax2_array[1]; - if ($localtax1ligne != 0 || $localtax1_type == '7') + if ($localtax1_type && ($localtax1ligne != 0 || $localtax1_type == '7')) $this->localtax1[$localtax1_type][$localtax1_rate]+=$localtax1ligne; - if ($localtax2ligne != 0 || $localtax2_type == '7') + if ($localtax2_type && ($localtax2ligne != 0 || $localtax2_type == '7')) $this->localtax2[$localtax2_type][$localtax2_rate]+=$localtax2ligne; if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate.='*'; From 013b7eca1092aae986d805f1cc846064a2e227aa Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 16 Mar 2013 17:02:13 +0100 Subject: [PATCH 7/8] Fix: A better fix for status/list of orders. There was a confusion because of bad translation key StatusOrderToBill that in fact mean "StatusOrderDelivered". More explanation: http://wiki.dolibarr.org/index.php/Module_Customers_Orders#Life_cycle_.2F_Business_rules --- htdocs/commande/liste.php | 5 +++-- htdocs/core/menus/standard/eldy.lib.php | 2 +- htdocs/langs/ca_ES/orders.lang | 6 ++++-- htdocs/langs/en_US/orders.lang | 2 +- htdocs/langs/es_ES/orders.lang | 6 ++++-- htdocs/langs/fr_FR/orders.lang | 2 +- 6 files changed, 14 insertions(+), 9 deletions(-) diff --git a/htdocs/commande/liste.php b/htdocs/commande/liste.php index df59576c88b..3bc807476e8 100644 --- a/htdocs/commande/liste.php +++ b/htdocs/commande/liste.php @@ -129,7 +129,8 @@ if ($viewstatut <> '') { if ($viewstatut < 4 && $viewstatut > -3) { - $sql.= ' AND c.fk_statut ='.$viewstatut; // brouillon, validee, en cours, annulee + if ($viewstatut == 1 && empty($conf->expedition->enabled)) $sql.= ' AND c.fk_statut IN (1,2)'; // If module expedition disabled, we include order with status 'sending in process' into 'validated' + else $sql.= ' AND c.fk_statut = '.$viewstatut; // brouillon, validee, en cours, annulee if ($viewstatut == 3) { $sql.= ' AND c.facture = 0'; // need to create invoice @@ -222,7 +223,7 @@ if ($resql) if ($viewstatut == -2) $title.=' - '.$langs->trans('StatusOrderToProcessShort'); if ($viewstatut == -3) - $title.=' - '.$langs->trans('StatusOrderValidated').', '.$langs->trans("StatusOrderSent").', '.$langs->trans('StatusOrderToBill'); + $title.=' - '.$langs->trans('StatusOrderValidated').', '.(empty($conf->expedition->enabled)?'':$langs->trans("StatusOrderSent").', ').$langs->trans('StatusOrderToBill'); $param='&socid='.$socid.'&viewstatut='.$viewstatut; if ($ordermonth) $param.='&ordermonth='.$ordermonth; diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index e33c307d367..3b16988abe5 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -857,7 +857,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after) if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire); if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire); if ($leftmenu=="orders" && ! empty($conf->expedition->enabled)) $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=2", $langs->trans("StatusOrderOnProcessShort"), 2, $user->rights->commande->lire); - if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=".($conf->expedition->enabled?"3":"-3"), $langs->trans("StatusOrderToBill"), 2, $user->rights->commande->lire); + if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=3", $langs->trans("StatusOrderToBill"), 2, $user->rights->commande->lire); // The translation key is StatusOrderToBill but it means StatusDelivered. TODO We should renamed this later if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire); if ($leftmenu=="orders") $newmenu->add("/commande/liste.php?leftmenu=orders&viewstatut=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire); $newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire); diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang index c63981ccf2e..39ee41a4ca9 100644 --- a/htdocs/langs/ca_ES/orders.lang +++ b/htdocs/langs/ca_ES/orders.lang @@ -32,7 +32,8 @@ StatusOrderOnProcessShort=En procés StatusOrderSentShort=Expedició en curs StatusOrderSent=Enviament en curs StatusOrderProcessedShort=Processada -StatusOrderToBillShort=A facturar +StatusOrderToBillShort=Emès +StatusOrderToBillShort2=A facturar StatusOrderApprovedShort=Aprovada StatusOrderRefusedShort=Rebutjada StatusOrderToProcessShort=A processar @@ -43,7 +44,8 @@ StatusOrderDraft=Esborrany (a validar) StatusOrderValidated=Validada StatusOrderOnProcess=Pendent de rebre StatusOrderProcessed=Processada -StatusOrderToBill=A facturar +StatusOrderToBill=Emès +StatusOrderToBill2=A facturar StatusOrderApproved=Aprovada StatusOrderRefused=Rebutjada StatusOrderReceivedPartially=Rebuda parcialment diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang index 2796759a8f0..172f6fb13c6 100644 --- a/htdocs/langs/en_US/orders.lang +++ b/htdocs/langs/en_US/orders.lang @@ -85,7 +85,7 @@ NumberOfOrdersByMonth=Number of orders by month AmountOfOrdersByMonthHT=amount of orders by month (net of tax) ListOfOrders=List of orders CloseOrder=Close order -ConfirmCloseOrder=Are you sure you want to close this order ? Once an order is closed, it can only be billed. +ConfirmCloseOrder=Are you sure you want to set this order to deliverd ? Once an order is delivered, it can be set to billed. ConfirmCloseOrderIfSending=Are you sure you want to close this order ? You must close an order only when all shipping are done. ConfirmDeleteOrder=Are you sure you want to delete this order ? ConfirmValidateOrder=Are you sure you want to validate this order under name %s ? diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang index 51bfbd082a2..65044ab09a7 100644 --- a/htdocs/langs/es_ES/orders.lang +++ b/htdocs/langs/es_ES/orders.lang @@ -32,7 +32,8 @@ StatusOrderOnProcessShort=En proceso StatusOrderSentShort=Expedición en curso StatusOrderSent=Envío en curso StatusOrderProcessedShort=Procesado -StatusOrderToBillShort=A facturar +StatusOrderToBillShort=Emitido +StatusOrderToBillShort2=A facturar StatusOrderApprovedShort=Aprobado StatusOrderRefusedShort=Rechazado StatusOrderToProcessShort=A procesar @@ -43,7 +44,8 @@ StatusOrderDraft=Borrador (a validar) StatusOrderValidated=Validado StatusOrderOnProcess=Pendiente de recibir StatusOrderProcessed=Procesado -StatusOrderToBill=A facturar +StatusOrderToBill=Emitido +StatusOrderToBill2=A facturar StatusOrderApproved=Aprobado StatusOrderRefused=Rechazado StatusOrderReceivedPartially=Recibido parcialmente diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang index 1866ecbdcfb..045b6223038 100644 --- a/htdocs/langs/fr_FR/orders.lang +++ b/htdocs/langs/fr_FR/orders.lang @@ -85,7 +85,7 @@ NumberOfOrdersByMonth=Nombre de commandes par mois AmountOfOrdersByMonthHT=Montant total de commandes par mois (HT) ListOfOrders=Liste des commandes CloseOrder=Clôturer commande -ConfirmCloseOrder=Êtes-vous sûr de vouloir clôturer cette commande ? Une fois une commande clôturée, elle peut être facturée. +ConfirmCloseOrder=Êtes-vous sûr de vouloir classer cette commande à Délivrée ? Une fois une commande délivrée, elle peut aussi être passée à facturée. ConfirmCloseOrderIfSending=Êtes-vous sûr de vouloir clôturer cette commande ? Vous ne devez clôturer une commande qu'une fois les produits expédiés. ConfirmDeleteOrder=Êtes-vous sûr de vouloir effacer cette commande ? ConfirmValidateOrder=Êtes-vous sûr de vouloir valider cette commande sous la référence %s ? From d4f5ac8754d966216529f806cfdf52e7e74d0cbf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 16 Mar 2013 18:02:32 +0100 Subject: [PATCH 8/8] Fix: regression after rename of field --- htdocs/cashdesk/index_verif.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/cashdesk/index_verif.php b/htdocs/cashdesk/index_verif.php index b6dc3cb2046..7ceabf13308 100644 --- a/htdocs/cashdesk/index_verif.php +++ b/htdocs/cashdesk/index_verif.php @@ -77,7 +77,7 @@ if ( $retour >= 0 ) { $return=array(); - $sql = "SELECT rowid, name, firstname"; + $sql = "SELECT rowid, lastname, firstname"; $sql.= " FROM ".MAIN_DB_PREFIX."user"; $sql.= " WHERE login = '".$username."'"; $sql.= " AND entity IN (0,".$conf->entity.")";