[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 314884: Fix : integration of expense
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 314884: Fix : integration of expense report in accounatncy... |
|
Date: |
Thu, 30 Mar 2017 03:09:34 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 3148841ecf47e1047f8509e31b0e15db9506033b
https://github.com/Dolibarr/dolibarr/commit/3148841ecf47e1047f8509e31b0e15db9506033b
Author: Alexandre SPANGARO <address@hidden>
Date: 2017-03-26 (Sun, 26 Mar 2017)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Fix : integration of expense report in accounatncy bank journal
Commit: ede23aacc91f74e9560e44f7d3c61e037a4293a7
https://github.com/Dolibarr/dolibarr/commit/ede23aacc91f74e9560e44f7d3c61e037a4293a7
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-28 (Tue, 28 Mar 2017)
Changed paths:
M htdocs/accountancy/journal/bankjournal.php
Log Message:
-----------
Merge pull request #6592 from aspangaro/5.0-p5
Fix : integration of expense report in accountancy bank journal
Commit: 90a90e1a3c97717274caa9267844eaee85218ff3
https://github.com/Dolibarr/dolibarr/commit/90a90e1a3c97717274caa9267844eaee85218ff3
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-28 (Tue, 28 Mar 2017)
Changed paths:
M htdocs/fourn/facture/paiement.php
Log Message:
-----------
FIX #6533 #6590
Commit: c84e20abaf246b51f32d7d269d0aa1b4c1e844ba
https://github.com/Dolibarr/dolibarr/commit/c84e20abaf246b51f32d7d269d0aa1b4c1e844ba
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-28 (Tue, 28 Mar 2017)
Changed paths:
M htdocs/langs/en_US/propal.lang
Log Message:
-----------
Fix translation
Commit: 3d1ae236e1c254b2abe7d4acedf3f76b87957fba
https://github.com/Dolibarr/dolibarr/commit/3d1ae236e1c254b2abe7d4acedf3f76b87957fba
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-28 (Tue, 28 Mar 2017)
Changed paths:
M htdocs/accountancy/admin/defaultaccounts.php
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/expensereport/card.php
M htdocs/accountancy/expensereport/lines.php
M htdocs/accountancy/expensereport/list.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/supplier/card.php
M htdocs/compta/salaries/index.php
M htdocs/expedition/card.php
M htdocs/holiday/card.php
A htdocs/theme/md/img/object_multicurrency.png
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: ad3b54b93a01348a5ec65a88b4ae137629a70353
https://github.com/Dolibarr/dolibarr/commit/ad3b54b93a01348a5ec65a88b4ae137629a70353
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-28 (Tue, 28 Mar 2017)
Changed paths:
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/expensereport/card.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/supplier/card.php
Log Message:
-----------
Fix regression
Commit: 1d6e760fc8a2a1395bfa3c493dcabf39639c84db
https://github.com/Dolibarr/dolibarr/commit/1d6e760fc8a2a1395bfa3c493dcabf39639c84db
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-29 (Wed, 29 Mar 2017)
Changed paths:
M htdocs/core/triggers/interface_50_modNotification_Notification.class.php
Log Message:
-----------
FIX Notification sending was broken.
Commit: fbca800246e66df7870f546abcc6da71d938c952
https://github.com/Dolibarr/dolibarr/commit/fbca800246e66df7870f546abcc6da71d938c952
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-29 (Wed, 29 Mar 2017)
Changed paths:
M htdocs/core/class/html.formother.class.php
Log Message:
-----------
FIX Detection of color brightness
Commit: f194ba6e097ec8baf16854e9ac10d71e3f9df644
https://github.com/Dolibarr/dolibarr/commit/f194ba6e097ec8baf16854e9ac10d71e3f9df644
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-29 (Wed, 29 Mar 2017)
Changed paths:
M htdocs/fourn/facture/paiement.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Commit: 78cc976e9f6d6f2d835ec8cf517e54ee120b9010
https://github.com/Dolibarr/dolibarr/commit/78cc976e9f6d6f2d835ec8cf517e54ee120b9010
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-30 (Thu, 30 Mar 2017)
Changed paths:
M htdocs/core/modules/modCron.class.php
M htdocs/core/modules/modModuleBuilder.class.php
M htdocs/core/modules/modPrinting.class.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/main.lang
M htdocs/langs/en_US/modulebuilder.lang
M htdocs/main.inc.php
Log Message:
-----------
Work on module builder
Commit: f01815519a1fcdc59f883de3969c7eba5e6d1131
https://github.com/Dolibarr/dolibarr/commit/f01815519a1fcdc59f883de3969c7eba5e6d1131
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-30 (Thu, 30 Mar 2017)
Changed paths:
M htdocs/adherents/agenda.php
M htdocs/core/lib/company.lib.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M htdocs/install/mysql/data/llx_c_action_trigger.sql
Log Message:
-----------
Fix trigger of automatic events
Commit: ce7368d10e00a44e0d8ba409720ed301956016d9
https://github.com/Dolibarr/dolibarr/commit/ce7368d10e00a44e0d8ba409720ed301956016d9
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-30 (Thu, 30 Mar 2017)
Changed paths:
M htdocs/adherents/agenda.php
M htdocs/langs/en_US/agenda.lang
Log Message:
-----------
Fix events create from member card not linked to member
Commit: 141ef91dea91b0662ba166c75e0deceacc4ba64c
https://github.com/Dolibarr/dolibarr/commit/141ef91dea91b0662ba166c75e0deceacc4ba64c
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-30 (Thu, 30 Mar 2017)
Changed paths:
M htdocs/core/modules/modAgenda.class.php
Log Message:
-----------
Fix default auto events
Commit: aca1c1944d9c6fc20750b99069dca080b43bfb1a
https://github.com/Dolibarr/dolibarr/commit/aca1c1944d9c6fc20750b99069dca080b43bfb1a
Author: Laurent Destailleur <address@hidden>
Date: 2017-03-30 (Thu, 30 Mar 2017)
Changed paths:
M htdocs/accountancy/customer/card.php
M htdocs/accountancy/expensereport/card.php
M htdocs/accountancy/journal/bankjournal.php
M htdocs/accountancy/supplier/card.php
M htdocs/adherents/agenda.php
M htdocs/core/lib/company.lib.php
M htdocs/core/modules/modAgenda.class.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M htdocs/core/triggers/interface_50_modNotification_Notification.class.php
M htdocs/fourn/facture/paiement.php
M htdocs/install/mysql/data/llx_c_action_trigger.sql
M htdocs/langs/en_US/agenda.lang
M htdocs/langs/en_US/propal.lang
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/install/mysql/data/llx_c_action_trigger.sql
Compare:
https://github.com/Dolibarr/dolibarr/compare/4df8dcf9800d...aca1c1944d9c