[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 399093: USe good status icon for thir
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 399093: USe good status icon for thirdparty ActivityCeased |
|
Date: |
Tue, 19 Nov 2013 12:16:16 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 399093f501f3c1226c66f2b7817b9c032554903a
https://github.com/Dolibarr/dolibarr/commit/399093f501f3c1226c66f2b7817b9c032554903a
Author: Florian Henry <address@hidden>
Date: 2013-11-01 (Fri, 01 Nov 2013)
Changed paths:
M htdocs/societe/class/societe.class.php
Log Message:
-----------
USe good status icon for thirdparty ActivityCeased
Commit: 987c09b882e4787a2d4edf3323bd19c6169d959b
https://github.com/Dolibarr/dolibarr/commit/987c09b882e4787a2d4edf3323bd19c6169d959b
Author: Florian Henry <address@hidden>
Date: 2013-11-01 (Fri, 01 Nov 2013)
Changed paths:
M ChangeLog
M htdocs/core/class/commonobject.class.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/lib/margins.lib.php
M htdocs/margin/productMargins.php
M htdocs/margin/tabs/productMargins.php
M htdocs/margin/tabs/thirdpartyMargins.php
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Commit: e8a80e236504d134249d6e691570d25f3561ed0a
https://github.com/Dolibarr/dolibarr/commit/e8a80e236504d134249d6e691570d25f3561ed0a
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-01 (Fri, 01 Nov 2013)
Changed paths:
M build/debian/changelog
Log Message:
-----------
Now comments in changelog are concatenated
Commit: 662f48ddc200b829369c521c0a1e376b86c54f6f
https://github.com/Dolibarr/dolibarr/commit/662f48ddc200b829369c521c0a1e376b86c54f6f
Author: Florian Henry <address@hidden>
Date: 2013-11-01 (Fri, 01 Nov 2013)
Changed paths:
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Use good icons
Commit: a4ce2d5f725f251b4378ef653dfd7398322ca6e3
https://github.com/Dolibarr/dolibarr/commit/a4ce2d5f725f251b4378ef653dfd7398322ca6e3
Author: Florian Henry <address@hidden>
Date: 2013-11-01 (Fri, 01 Nov 2013)
Changed paths:
M ChangeLog
M build/debian/changelog
M build/exe/doliwamp/doliwamp.iss
M build/makepack-dolibarr.pl
M build/rpm/dolibarr_fedora.spec
M build/rpm/dolibarr_generic.spec
M build/rpm/dolibarr_mandriva.spec
M build/rpm/dolibarr_opensuse.spec
M htdocs/admin/tools/dolibarr_export.php
M htdocs/admin/tools/export.php
M htdocs/filefunc.inc.php
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4
Commit: 6aea0bf7a1e4f686feca224a43bf7e1ffe5161b5
https://github.com/Dolibarr/dolibarr/commit/6aea0bf7a1e4f686feca224a43bf7e1ffe5161b5
Author: Florian Henry <address@hidden>
Date: 2013-11-02 (Sat, 02 Nov 2013)
Changed paths:
M ChangeLog
M htdocs/compta/facture/list.php
Log Message:
-----------
Fix [ bug #1105 ] Searching Boxes other search option
Commit: c5f29e14a452ac39aa30ca6135d94f149ad39bee
https://github.com/Dolibarr/dolibarr/commit/c5f29e14a452ac39aa30ca6135d94f149ad39bee
Author: Grand Philippe <address@hidden>
Date: 2013-11-02 (Sat, 02 Nov 2013)
Changed paths:
M htdocs/adherents/admin/adherent.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/document.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/document.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/cron/card.php
M htdocs/cron/list.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/document.php
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/cron.lang
M htdocs/langs/fr_FR/projects.lang
Log Message:
-----------
missing trad and fix language
Commit: 8105021cfd76f810ffa3fbba975c803210ae3996
https://github.com/Dolibarr/dolibarr/commit/8105021cfd76f810ffa3fbba975c803210ae3996
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-03 (Sun, 03 Nov 2013)
Changed paths:
M htdocs/adherents/admin/adherent.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/document.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/document.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/cron/card.php
M htdocs/cron/list.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/document.php
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/cron.lang
M htdocs/langs/fr_FR/projects.lang
Log Message:
-----------
Merge pull request #1275 from grandoc/3.4
missing trad and fix language
Commit: b2df689669d13be1cc705111efad6a91d7eeab7f
https://github.com/Dolibarr/dolibarr/commit/b2df689669d13be1cc705111efad6a91d7eeab7f
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-03 (Sun, 03 Nov 2013)
Changed paths:
M ChangeLog
M htdocs/compta/facture/list.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge pull request #1274 from FHenry/3.4
USe good status icon for thirdparty ActivityCeased
Commit: aaf1dd1b27a6e2f2cb25a6c80bf80e33bd3b1a92
https://github.com/Dolibarr/dolibarr/commit/aaf1dd1b27a6e2f2cb25a6c80bf80e33bd3b1a92
Author: Grand Philippe <address@hidden>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
M htdocs/langs/fr_FR/projects.lang
Log Message:
-----------
fix some language error
Commit: 59085d73313ea3ffe17b82f1dfad0bdf7c4fb887
https://github.com/Dolibarr/dolibarr/commit/59085d73313ea3ffe17b82f1dfad0bdf7c4fb887
Author: Grand Philippe <address@hidden>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
M ChangeLog
M htdocs/compta/facture/list.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge branch '3.4' of https://github.com/Dolibarr/dolibarr into 3.4
Commit: 8653f3f0263e82f9940a1c52366b99f8c83dc676
https://github.com/Dolibarr/dolibarr/commit/8653f3f0263e82f9940a1c52366b99f8c83dc676
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
M htdocs/langs/en_US/dict.lang
M htdocs/langs/fr_FR/dict.lang
Log Message:
-----------
Add missing Country UK.
Commit: c41ac3435681c157995b41dc4bbfdcc3bc8fae3f
https://github.com/Dolibarr/dolibarr/commit/c41ac3435681c157995b41dc4bbfdcc3bc8fae3f
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
M htdocs/langs/en_US/dict.lang
M htdocs/langs/fr_FR/dict.lang
Log Message:
-----------
Merge remote-tracking branch 'origin/3.3' into 3.4
Commit: c7be0ee9e234bfc7662a6585124202bee6867b37
https://github.com/Dolibarr/dolibarr/commit/c7be0ee9e234bfc7662a6585124202bee6867b37
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Changed paths:
M htdocs/langs/fr_FR/projects.lang
Log Message:
-----------
Merge pull request #1277 from grandoc/3.4
3.4
Commit: b82cbf1385c424cee705fd08f1a97e5b0fd73b7a
https://github.com/Dolibarr/dolibarr/commit/b82cbf1385c424cee705fd08f1a97e5b0fd73b7a
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-06 (Wed, 06 Nov 2013)
Changed paths:
M htdocs/compta/bank/account.php
Log Message:
-----------
Fix: current balance was visible when it should not
Conflicts:
htdocs/compta/bank/account.php
Commit: 91702593513f12814cc84ea2d7b771e13c8255ac
https://github.com/Dolibarr/dolibarr/commit/91702593513f12814cc84ea2d7b771e13c8255ac
Author: aspangaro <address@hidden>
Date: 2013-11-08 (Fri, 08 Nov 2013)
Changed paths:
M htdocs/compta/bank/account.php
Log Message:
-----------
fix for language
Commit: 4b26d8441b66b251d2aba0c8a959566d07102206
https://github.com/Dolibarr/dolibarr/commit/4b26d8441b66b251d2aba0c8a959566d07102206
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-09 (Sat, 09 Nov 2013)
Changed paths:
M htdocs/product/fiche.php
Log Message:
-----------
Fix: Entry lost
Commit: 4b3778d116b103ce360df7f201b694a9d9e2888d
https://github.com/Dolibarr/dolibarr/commit/4b3778d116b103ce360df7f201b694a9d9e2888d
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-09 (Sat, 09 Nov 2013)
Changed paths:
M htdocs/compta/bank/account.php
Log Message:
-----------
Merge pull request #1292 from aspangaro/3.4
fix for language
Commit: 6b6855dff502b76bb23f1d0a956eb244e239afff
https://github.com/Dolibarr/dolibarr/commit/6b6855dff502b76bb23f1d0a956eb244e239afff
Author: aspangaro <address@hidden>
Date: 2013-11-09 (Sat, 09 Nov 2013)
Changed paths:
M htdocs/core/modules/dons/html_cerfafr.html
M htdocs/core/modules/dons/html_cerfafr.modules.php
Log Message:
-----------
Fix for document cerfa into module Don
Commit: 0dfbfbc19a8a46b7b47ce85b094062143076bad0
https://github.com/Dolibarr/dolibarr/commit/0dfbfbc19a8a46b7b47ce85b094062143076bad0
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-10 (Sun, 10 Nov 2013)
Changed paths:
M htdocs/core/modules/dons/html_cerfafr.html
M htdocs/core/modules/dons/html_cerfafr.modules.php
Log Message:
-----------
Merge pull request #1293 from aspangaro/3.4
Fix for document cerfa into module Don
Commit: 5b7f2e0c53acf9d0bf89d0b6150490ef139a5095
https://github.com/Dolibarr/dolibarr/commit/5b7f2e0c53acf9d0bf89d0b6150490ef139a5095
Author: Florian Henry <address@hidden>
Date: 2013-11-11 (Mon, 11 Nov 2013)
Changed paths:
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/nl_NL/categories.lang
M htdocs/langs/nl_NL/commercial.lang
M htdocs/langs/nl_NL/companies.lang
M htdocs/langs/nl_NL/dict.lang
M htdocs/langs/nl_NL/main.lang
M htdocs/langs/nl_NL/margins.lang
M htdocs/langs/nl_NL/products.lang
Log Message:
-----------
Better nl_NL translation
Commit: 4ad541316398353d86a67c018c701569e051e050
https://github.com/Dolibarr/dolibarr/commit/4ad541316398353d86a67c018c701569e051e050
Author: Raphaël Doursenaud <address@hidden>
Date: 2013-11-12 (Tue, 12 Nov 2013)
Changed paths:
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Log Message:
-----------
Sync db upgrade with db install to avoid silly upgrade errors
Commit: 7dbe2bcf2c23b8c54588b912de5e52f5728dd598
https://github.com/Dolibarr/dolibarr/commit/7dbe2bcf2c23b8c54588b912de5e52f5728dd598
Author: Christophe Battarel <address@hidden>
Date: 2013-11-13 (Wed, 13 Nov 2013)
Changed paths:
M htdocs/fourn/class/fournisseur.product.class.php
Log Message:
-----------
fix wrong buy price update
Commit: d23130739b4714b49738b03b31adb09c024d01d3
https://github.com/Dolibarr/dolibarr/commit/d23130739b4714b49738b03b31adb09c024d01d3
Author: Christophe Battarel <address@hidden>
Date: 2013-11-13 (Wed, 13 Nov 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
update ChangeLog
Commit: 4acb9f8cba733943cfa4a7a437d0265f44cda26c
https://github.com/Dolibarr/dolibarr/commit/4acb9f8cba733943cfa4a7a437d0265f44cda26c
Author: aspangaro <address@hidden>
Date: 2013-11-14 (Thu, 14 Nov 2013)
Changed paths:
M ChangeLog
M htdocs/adherents/admin/adherent.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/document.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/document.php
M htdocs/compta/bank/account.php
M htdocs/compta/facture/class/facture.class.php
M htdocs/compta/facture/list.php
M htdocs/cron/card.php
M htdocs/cron/list.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/fourn/commande/document.php
M htdocs/langs/en_US/dict.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/cron.lang
M htdocs/langs/fr_FR/dict.lang
M htdocs/langs/fr_FR/projects.lang
M htdocs/product/fiche.php
M htdocs/societe/class/societe.class.php
Log Message:
-----------
Merge branch 'upstream/3.4'
Commit: e8c7bb9c6202abaec0c1d9e4b62550c705f48d5a
https://github.com/Dolibarr/dolibarr/commit/e8c7bb9c6202abaec0c1d9e4b62550c705f48d5a
Author: aspangaro <address@hidden>
Date: 2013-11-14 (Thu, 14 Nov 2013)
Changed paths:
M htdocs/compta/prelevement/bons.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-rejet.php
M htdocs/compta/prelevement/fiche-stat.php
M htdocs/compta/prelevement/fiche.php
M htdocs/compta/prelevement/ligne.php
M htdocs/compta/prelevement/lignes.php
M htdocs/compta/prelevement/liste.php
Log Message:
-----------
Fix for language
Commit: 8050f8e9fe3619430511a65c07400260aaa04bd0
https://github.com/Dolibarr/dolibarr/commit/8050f8e9fe3619430511a65c07400260aaa04bd0
Author: aspangaro <address@hidden>
Date: 2013-11-14 (Thu, 14 Nov 2013)
Changed paths:
M htdocs/societe/rib.php
Log Message:
-----------
Fix problem field
Commit: 200553c001264dc51e9fc214c7ce4f65ca65fa06
https://github.com/Dolibarr/dolibarr/commit/200553c001264dc51e9fc214c7ce4f65ca65fa06
Author: aspangaro <address@hidden>
Date: 2013-11-14 (Thu, 14 Nov 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Update ChangeLog
Commit: 4099038083196bf4103959087066f34403b876b2
https://github.com/Dolibarr/dolibarr/commit/4099038083196bf4103959087066f34403b876b2
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-15 (Fri, 15 Nov 2013)
Changed paths:
M ChangeLog
M htdocs/compta/prelevement/bons.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-rejet.php
M htdocs/compta/prelevement/fiche-stat.php
M htdocs/compta/prelevement/fiche.php
M htdocs/compta/prelevement/ligne.php
M htdocs/compta/prelevement/lignes.php
M htdocs/compta/prelevement/liste.php
M htdocs/societe/rib.php
Log Message:
-----------
Merge pull request #1301 from aspangaro/3.4
Fix 3.4
Commit: a92aa14459492eb20550449f08dff7895b78f0c2
https://github.com/Dolibarr/dolibarr/commit/a92aa14459492eb20550449f08dff7895b78f0c2
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-15 (Fri, 15 Nov 2013)
Changed paths:
M ChangeLog
M htdocs/fourn/class/fournisseur.product.class.php
Log Message:
-----------
Merge pull request #1299 from altairis-fr/3.4
fix wrong buy price update (confusion between entity and npr !)
Commit: ef9db84a88208e3796dc7b49bc386b9e14e50549
https://github.com/Dolibarr/dolibarr/commit/ef9db84a88208e3796dc7b49bc386b9e14e50549
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-15 (Fri, 15 Nov 2013)
Changed paths:
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
Log Message:
-----------
Merge pull request #1297 from GPCsolutions/3.4-dbupgradefix
Sync db upgrade with db install to avoid silly upgrade errors
Commit: 52b66a839b5f3e1c9b26d835d614276e84ac6222
https://github.com/Dolibarr/dolibarr/commit/52b66a839b5f3e1c9b26d835d614276e84ac6222
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-15 (Fri, 15 Nov 2013)
Changed paths:
M htdocs/langs/nl_NL/admin.lang
M htdocs/langs/nl_NL/categories.lang
M htdocs/langs/nl_NL/commercial.lang
M htdocs/langs/nl_NL/companies.lang
M htdocs/langs/nl_NL/dict.lang
M htdocs/langs/nl_NL/main.lang
M htdocs/langs/nl_NL/margins.lang
M htdocs/langs/nl_NL/products.lang
Log Message:
-----------
Merge pull request #1296 from FHenry/3.4
Better nl_NL translation
Commit: 89a56389086e599f976ae81670d1040f45f84597
https://github.com/Dolibarr/dolibarr/commit/89a56389086e599f976ae81670d1040f45f84597
Author: Christophe Battarel <address@hidden>
Date: 2013-11-17 (Sun, 17 Nov 2013)
Changed paths:
M htdocs/langs/en_US/margins.lang
M htdocs/langs/fr_FR/margins.lang
Log Message:
-----------
Fix bad translation on margin config
Commit: 3884c335352fa04f996a5b7053f60bd885654448
https://github.com/Dolibarr/dolibarr/commit/3884c335352fa04f996a5b7053f60bd885654448
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-17 (Sun, 17 Nov 2013)
Changed paths:
M htdocs/langs/en_US/margins.lang
M htdocs/langs/fr_FR/margins.lang
Log Message:
-----------
Merge pull request #1304 from altairis-fr/3.4
Fix bad translation on margin config
Commit: 870b78fc19184fbd8d36588df1af0620c95b2883
https://github.com/Dolibarr/dolibarr/commit/870b78fc19184fbd8d36588df1af0620c95b2883
Author: Florian Henry <address@hidden>
Date: 2013-11-19 (Tue, 19 Nov 2013)
Changed paths:
M htdocs/fourn/facture/paiement.php
Log Message:
-----------
[ bug #1142 ] Set paiement on invoice
Commit: 68718c6100bc971c56678dd0b05c6961dc9327bb
https://github.com/Dolibarr/dolibarr/commit/68718c6100bc971c56678dd0b05c6961dc9327bb
Author: Florian Henry <address@hidden>
Date: 2013-11-19 (Tue, 19 Nov 2013)
Changed paths:
M ChangeLog
Log Message:
-----------
Update changelog
Commit: 583a3dadb15efdb83da1173321ebcdb72c704860
https://github.com/Dolibarr/dolibarr/commit/583a3dadb15efdb83da1173321ebcdb72c704860
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-19 (Tue, 19 Nov 2013)
Changed paths:
M ChangeLog
M htdocs/fourn/facture/paiement.php
Log Message:
-----------
Merge pull request #1308 from FHenry/3.4
[ bug #1142 ] Set paiement on invoice
Commit: 0e743d5024d3a74503bd0bd2444a1ddc8820fe2d
https://github.com/Dolibarr/dolibarr/commit/0e743d5024d3a74503bd0bd2444a1ddc8820fe2d
Author: Laurent Destailleur <address@hidden>
Date: 2013-11-19 (Tue, 19 Nov 2013)
Changed paths:
M ChangeLog
M build/debian/changelog
M htdocs/adherents/admin/adherent.php
M htdocs/comm/propal/class/propal.class.php
M htdocs/comm/propal/document.php
M htdocs/commande/class/commande.class.php
M htdocs/commande/document.php
M htdocs/compta/prelevement/bons.php
M htdocs/compta/prelevement/factures.php
M htdocs/compta/prelevement/fiche-rejet.php
M htdocs/compta/prelevement/fiche-stat.php
M htdocs/compta/prelevement/fiche.php
M htdocs/compta/prelevement/ligne.php
M htdocs/compta/prelevement/lignes.php
M htdocs/compta/prelevement/liste.php
M htdocs/cron/card.php
M htdocs/fourn/class/fournisseur.commande.class.php
M htdocs/fourn/class/fournisseur.product.class.php
M htdocs/fourn/commande/document.php
M htdocs/fourn/facture/paiement.php
M htdocs/install/mysql/migration/3.3.0-3.4.0.sql
M htdocs/langs/el_GR/agenda.lang
M htdocs/langs/el_GR/boxes.lang
M htdocs/langs/el_GR/companies.lang
M htdocs/langs/el_GR/errors.lang
M htdocs/langs/el_GR/holiday.lang
M htdocs/langs/el_GR/main.lang
M htdocs/langs/el_GR/members.lang
M htdocs/langs/el_GR/orders.lang
M htdocs/langs/el_GR/other.lang
M htdocs/langs/el_GR/products.lang
M htdocs/langs/el_GR/projects.lang
M htdocs/langs/el_GR/users.lang
M htdocs/langs/el_GR/withdrawals.lang
M htdocs/langs/en_US/dict.lang
M htdocs/langs/en_US/margins.lang
M htdocs/langs/fr_FR/admin.lang
M htdocs/langs/fr_FR/cron.lang
M htdocs/langs/fr_FR/dict.lang
M htdocs/langs/fr_FR/margins.lang
M htdocs/langs/fr_FR/projects.lang
M htdocs/langs/lv_LV/admin.lang
M htdocs/langs/lv_LV/agenda.lang
M htdocs/langs/lv_LV/boxes.lang
M htdocs/langs/lv_LV/cashdesk.lang
M htdocs/langs/lv_LV/companies.lang
M htdocs/langs/lv_LV/externalsite.lang
M htdocs/langs/lv_LV/ftp.lang
M htdocs/langs/lv_LV/install.lang
M htdocs/langs/lv_LV/languages.lang
M htdocs/langs/lv_LV/main.lang
M htdocs/langs/lv_LV/oscommerce.lang
M htdocs/langs/lv_LV/products.lang
M htdocs/langs/lv_LV/shop.lang
M htdocs/langs/lv_LV/sms.lang
M htdocs/langs/lv_LV/workflow.lang
M htdocs/product/fiche.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
ChangeLog
htdocs/adherents/admin/adherent.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/document.php
htdocs/compta/facture/class/facture.class.php
htdocs/compta/facture/list.php
htdocs/cron/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/commande/document.php
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/cron.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/nl_NL/admin.lang
htdocs/langs/nl_NL/categories.lang
htdocs/langs/nl_NL/commercial.lang
htdocs/langs/nl_NL/companies.lang
htdocs/langs/nl_NL/dict.lang
htdocs/langs/nl_NL/main.lang
htdocs/langs/nl_NL/margins.lang
htdocs/langs/nl_NL/products.lang
htdocs/societe/class/societe.class.php
htdocs/societe/rib.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/568c296c6c82...0e743d5024d3