[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] b5d720: fix 6.0 accountancy multienti
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] b5d720: fix 6.0 accountancy multientity |
|
Date: |
Sat, 05 May 2018 05:40:57 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: b5d720651968b2ad26418f2a1713e2d34792a464
https://github.com/Dolibarr/dolibarr/commit/b5d720651968b2ad26418f2a1713e2d34792a464
Author: florian HENRY <address@hidden>
Date: 2018-05-01 (Tue, 01 May 2018)
Changed paths:
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/journals_list.php
M htdocs/core/class/html.formaccounting.class.php
Log Message:
-----------
fix 6.0 accountancy multientity
Commit: 3340598cf8256a74dd9dad0b01646e8ffa4da838
https://github.com/Dolibarr/dolibarr/commit/3340598cf8256a74dd9dad0b01646e8ffa4da838
Author: Laurent Destailleur <address@hidden>
Date: 2018-05-01 (Tue, 01 May 2018)
Changed paths:
M htdocs/commande/card.php
M htdocs/compta/bank/various_payment/card.php
M htdocs/supplier_proposal/card.php
Log Message:
-----------
FIX Projet is not prefilled when created from overwiew page
Commit: f2b1aa00b9f837651af6bebf02105b82122893bb
https://github.com/Dolibarr/dolibarr/commit/f2b1aa00b9f837651af6bebf02105b82122893bb
Author: florian HENRY <address@hidden>
Date: 2018-05-02 (Wed, 02 May 2018)
Log Message:
-----------
Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0
Commit: 886ad9d4b644b295bbc673b98ec437d84f5945f5
https://github.com/Dolibarr/dolibarr/commit/886ad9d4b644b295bbc673b98ec437d84f5945f5
Author: florian HENRY <address@hidden>
Date: 2018-05-02 (Wed, 02 May 2018)
Changed paths:
M htdocs/accountancy/admin/account.php
Log Message:
-----------
check eldy message
Commit: 3657857d2160ba759f0f2429aa5e119d122b3026
https://github.com/Dolibarr/dolibarr/commit/3657857d2160ba759f0f2429aa5e119d122b3026
Author: florian HENRY <address@hidden>
Date: 2018-05-02 (Wed, 02 May 2018)
Changed paths:
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
Log Message:
-----------
fix project and task visibility same as list
Commit: 46e94af5949c233dc165b20af77048d0f9852482
https://github.com/Dolibarr/dolibarr/commit/46e94af5949c233dc165b20af77048d0f9852482
Author: florian HENRY <address@hidden>
Date: 2018-05-02 (Wed, 02 May 2018)
Changed paths:
M htdocs/projet/tasks/list.php
Log Message:
-----------
fix taskid
Commit: db76fd7895233bb13e1996fd8b800cf1048d9dd5
https://github.com/Dolibarr/dolibarr/commit/db76fd7895233bb13e1996fd8b800cf1048d9dd5
Author: fappels <address@hidden>
Date: 2018-05-02 (Wed, 02 May 2018)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/variants/class/ProductCombination.class.php
M htdocs/variants/generator.php
Log Message:
-----------
Fix delete all product variants of a parent product
User object missing
Commit: 6245f25deb85cc0ef6cdb92e89ff64fb72e54d79
https://github.com/Dolibarr/dolibarr/commit/6245f25deb85cc0ef6cdb92e89ff64fb72e54d79
Author: atm-arnaud <address@hidden>
Date: 2018-05-03 (Thu, 03 May 2018)
Changed paths:
M htdocs/projet/list.php
Log Message:
-----------
FIX label in getnomurl projectlist
Commit: 08cf034e2f35db1ce6cc5e40e6e25606f6948426
https://github.com/Dolibarr/dolibarr/commit/08cf034e2f35db1ce6cc5e40e6e25606f6948426
Author: Laurent Destailleur <address@hidden>
Date: 2018-05-03 (Thu, 03 May 2018)
Changed paths:
M htdocs/core/lib/functions.lib.php
Log Message:
-----------
FIX to allow IRPF not null even if main VAT is null.
>From https://www.javierrguez.com/problema-facturas-irpf-sin-iva-dolibarr/
Commit: 7bb9615cff2583eeaa86c9bbfa01f75b2812bcae
https://github.com/Dolibarr/dolibarr/commit/7bb9615cff2583eeaa86c9bbfa01f75b2812bcae
Author: Laurent Destailleur <address@hidden>
Date: 2018-05-05 (Sat, 05 May 2018)
Changed paths:
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/journals_list.php
M htdocs/core/class/html.formaccounting.class.php
Log Message:
-----------
Merge pull request #8702 from atm-florian/6.0
fix accountancy multientity
Commit: 8d52c4f9197d1dbafb8a7b8c55f368c6afeb8f8d
https://github.com/Dolibarr/dolibarr/commit/8d52c4f9197d1dbafb8a7b8c55f368c6afeb8f8d
Author: Laurent Destailleur <address@hidden>
Date: 2018-05-05 (Sat, 05 May 2018)
Changed paths:
M htdocs/projet/tasks/list.php
Log Message:
-----------
Merge pull request #8721 from atm-florian/6.0_fixtaskid
fix taskid
Commit: 2f79a12c6b8807f91e12e43608be01e252edab79
https://github.com/Dolibarr/dolibarr/commit/2f79a12c6b8807f91e12e43608be01e252edab79
Author: Laurent Destailleur <address@hidden>
Date: 2018-05-05 (Sat, 05 May 2018)
Changed paths:
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
Log Message:
-----------
Merge pull request #8720 from atm-florian/6.0_pjAndTskCounter
fix project and task visibility same as list
Commit: 352676cd1664b42c36cfa2ba5f257884213cd0ee
https://github.com/Dolibarr/dolibarr/commit/352676cd1664b42c36cfa2ba5f257884213cd0ee
Author: Laurent Destailleur <address@hidden>
Date: 2018-05-05 (Sat, 05 May 2018)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/variants/class/ProductCombination.class.php
M htdocs/variants/generator.php
Log Message:
-----------
Merge pull request #8725 from fappels/Fix_7.0_ProductCombbination
FIX delete all product variants of a parent product
Commit: f6ca1eb6248e022288a32d25a1c0fa9c53cda556
https://github.com/Dolibarr/dolibarr/commit/f6ca1eb6248e022288a32d25a1c0fa9c53cda556
Author: Laurent Destailleur <address@hidden>
Date: 2018-05-05 (Sat, 05 May 2018)
Changed paths:
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/modStock.class.php
M htdocs/product/inventory/card.php
M htdocs/product/inventory/list.php
Log Message:
-----------
Fix permission name
Commit: 44cb60e61dce2f4aad0831de1a4fd8dfffea36d1
https://github.com/Dolibarr/dolibarr/commit/44cb60e61dce2f4aad0831de1a4fd8dfffea36d1
Author: Laurent Destailleur <address@hidden>
Date: 2018-05-05 (Sat, 05 May 2018)
Changed paths:
M htdocs/product/class/product.class.php
M htdocs/variants/class/ProductCombination.class.php
M htdocs/variants/generator.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Commit: 8b4b78696996e2a22abd485d811f9f352fefc9f6
https://github.com/Dolibarr/dolibarr/commit/8b4b78696996e2a22abd485d811f9f352fefc9f6
Author: Laurent Destailleur <address@hidden>
Date: 2018-05-05 (Sat, 05 May 2018)
Changed paths:
M htdocs/projet/list.php
Log Message:
-----------
Merge pull request #8730 from atm-arnaud/FIX_project_list_label
FIX label in getnomurl projectlist
Commit: a9c7f905121083354b7b04d4a300c9be87a40c4e
https://github.com/Dolibarr/dolibarr/commit/a9c7f905121083354b7b04d4a300c9be87a40c4e
Author: Laurent Destailleur <address@hidden>
Date: 2018-05-05 (Sat, 05 May 2018)
Changed paths:
M htdocs/user/logout.php
Log Message:
-----------
Missing hook after deprecated trigger
Commit: be561a63c227f448ffe1fb1d749ab88ac70956bd
https://github.com/Dolibarr/dolibarr/commit/be561a63c227f448ffe1fb1d749ab88ac70956bd
Author: Laurent Destailleur <address@hidden>
Date: 2018-05-05 (Sat, 05 May 2018)
Changed paths:
M htdocs/admin/expedition.php
M htdocs/admin/livraison.php
M htdocs/admin/mailing.php
M htdocs/admin/mailman.php
M htdocs/admin/mails.php
M htdocs/admin/mails_emailing.php
M htdocs/admin/mails_templates.php
M htdocs/comm/propal/list.php
M htdocs/commande/list.php
M htdocs/compta/facture/list.php
M htdocs/core/actions_massactions.inc.php
M htdocs/install/mysql/tables/llx_entrepot.sql
M htdocs/install/mysql/tables/llx_stock_mouvement.sql
M htdocs/langs/fr_FR/errors.lang
M htdocs/societe/card.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: bdf4c0704b52c306cf75972573eb8ae3a514ef83
https://github.com/Dolibarr/dolibarr/commit/bdf4c0704b52c306cf75972573eb8ae3a514ef83
Author: Laurent Destailleur <address@hidden>
Date: 2018-05-05 (Sat, 05 May 2018)
Changed paths:
M ChangeLog
M htdocs/categories/class/categorie.class.php
Log Message:
-----------
Removed depreaceted not used method Categorie::get_nb_categories()
Commit: 363eaf0d72196120bb9af4ff96f97cccbb71a6c6
https://github.com/Dolibarr/dolibarr/commit/363eaf0d72196120bb9af4ff96f97cccbb71a6c6
Author: Laurent Destailleur <address@hidden>
Date: 2018-05-05 (Sat, 05 May 2018)
Changed paths:
M htdocs/categories/class/categorie.class.php
M
htdocs/core/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php
Log Message:
-----------
FIX Parameters to triggers must be set into $this->context array.
Commit: 407343645e674ce3a7f75c8448f61f5ae472ea39
https://github.com/Dolibarr/dolibarr/commit/407343645e674ce3a7f75c8448f61f5ae472ea39
Author: Laurent Destailleur <address@hidden>
Date: 2018-05-05 (Sat, 05 May 2018)
Changed paths:
M htdocs/admin/menus.php
M htdocs/admin/payment.php
M htdocs/admin/prelevement.php
M htdocs/admin/propal.php
M htdocs/admin/proxy.php
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: e254d6951d312623b505bb67f84011f638fdfd62
https://github.com/Dolibarr/dolibarr/commit/e254d6951d312623b505bb67f84011f638fdfd62
Author: Laurent Destailleur <address@hidden>
Date: 2018-05-05 (Sat, 05 May 2018)
Changed paths:
M htdocs/compta/facture/list.php
M htdocs/core/actions_massactions.inc.php
M htdocs/core/tpl/massactions_pre.tpl.php
M htdocs/langs/en_US/main.lang
M htdocs/langs/fr_FR/main.lang
Log Message:
-----------
Merge branch 'develop' of address@hidden:Dolibarr/dolibarr.git into develop
Commit: 9c68b81f595e1a0119b8fa3ea66e0e911ea6d9aa
https://github.com/Dolibarr/dolibarr/commit/9c68b81f595e1a0119b8fa3ea66e0e911ea6d9aa
Author: Laurent Destailleur <address@hidden>
Date: 2018-05-05 (Sat, 05 May 2018)
Changed paths:
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/journals_list.php
M htdocs/core/class/html.formaccounting.class.php
M htdocs/fourn/class/fournisseur.facture.class.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
M htdocs/projet/tasks/list.php
Log Message:
-----------
Merge branch '6.0' of address@hidden:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/projet/class/task.class.php
Commit: 546da0ceda7a6f5ad8937a5e4bf8e1841d0356bd
https://github.com/Dolibarr/dolibarr/commit/546da0ceda7a6f5ad8937a5e4bf8e1841d0356bd
Author: Laurent Destailleur <address@hidden>
Date: 2018-05-05 (Sat, 05 May 2018)
Changed paths:
M htdocs/accountancy/admin/account.php
M htdocs/accountancy/admin/journals_list.php
M htdocs/commande/card.php
M htdocs/compta/bank/various_payment/card.php
M htdocs/core/class/html.formaccounting.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/modules/modStock.class.php
M htdocs/product/class/product.class.php
M htdocs/product/inventory/card.php
M htdocs/product/inventory/list.php
M htdocs/projet/activity/perday.php
M htdocs/projet/activity/perweek.php
M htdocs/projet/class/project.class.php
M htdocs/projet/class/task.class.php
M htdocs/projet/tasks/list.php
M htdocs/supplier_proposal/card.php
M htdocs/variants/class/ProductCombination.class.php
M htdocs/variants/generator.php
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/5eec9efe0ca9...546da0ceda7a
**NOTE:** This service been marked for deprecation:
https://developer.github.com/changes/2018-04-25-github-services-deprecation/
Functionality will be removed from GitHub.com on January 31st, 2019.