[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] f8e156: FIX: Email templates not comp
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] f8e156: FIX: Email templates not compatible with Multicomp... |
|
Date: |
Thu, 21 Jan 2016 18:25:41 -0800 |
Branch: refs/heads/3.9
Home: https://github.com/Dolibarr/dolibarr
Commit: f8e156ea3077eddbd9bfce237c947e5b7217b6c1
https://github.com/Dolibarr/dolibarr/commit/f8e156ea3077eddbd9bfce237c947e5b7217b6c1
Author: fmarcet <address@hidden>
Date: 2015-12-29 (Tue, 29 Dec 2015)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Commit: cebb996120064713c6a8975e0282883b7bfbacb7
https://github.com/Dolibarr/dolibarr/commit/cebb996120064713c6a8975e0282883b7bfbacb7
Author: fmarcet <address@hidden>
Date: 2015-12-29 (Tue, 29 Dec 2015)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Commit: cafe148f7278be9e7ca0abec6ab6cf1e65ea0d36
https://github.com/Dolibarr/dolibarr/commit/cafe148f7278be9e7ca0abec6ab6cf1e65ea0d36
Author: fmarcet <address@hidden>
Date: 2016-01-04 (Mon, 04 Jan 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Commit: ffd7f4ea30fd2e09a05675a48c3445eb3f6e513e
https://github.com/Dolibarr/dolibarr/commit/ffd7f4ea30fd2e09a05675a48c3445eb3f6e513e
Author: Sergio Sanchis Climent <address@hidden>
Date: 2016-01-05 (Tue, 05 Jan 2016)
Changed paths:
M htdocs/core/lib/price.lib.php
Log Message:
-----------
Fix userlocaltax
Is posible userlocaltax1_rate or userlocaltax2_rate have value 0.0000 and no
enter in if, now check if diferent 0 and now enter
Commit: d8360a2a0169886c3c9be771202be480db12b534
https://github.com/Dolibarr/dolibarr/commit/d8360a2a0169886c3c9be771202be480db12b534
Author: fmarcet <address@hidden>
Date: 2016-01-07 (Thu, 07 Jan 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
FIX: Email templates not compatible with Multicompany
Commit: dfdf58051e2c58a8a25e28886112384dca7e2111
https://github.com/Dolibarr/dolibarr/commit/dfdf58051e2c58a8a25e28886112384dca7e2111
Author: Sergio Sanchis Climent <address@hidden>
Date: 2016-01-07 (Thu, 07 Jan 2016)
Changed paths:
M htdocs/core/lib/price.lib.php
Log Message:
-----------
Edited correctly for check values
Commit: 40f0d0c9f2bfdab905adb5ee1a805a3945d37c22
https://github.com/Dolibarr/dolibarr/commit/40f0d0c9f2bfdab905adb5ee1a805a3945d37c22
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/admin/dict.php
Log Message:
-----------
Merge pull request #4321 from fmarcet/3.7
FIX: Email templates not compatible with Multicompany
Commit: 94814e58e50fdd90e6e24cd42f9589a5657fe3c2
https://github.com/Dolibarr/dolibarr/commit/94814e58e50fdd90e6e24cd42f9589a5657fe3c2
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/core/lib/price.lib.php
Log Message:
-----------
Merge pull request #4334 from olsesacl/patch-1
Fix check userlocaltax1_rate and userlocaltax2_rate
Commit: 6685502d5cd2cfde5e7726496a399dc1eef91d06
https://github.com/Dolibarr/dolibarr/commit/6685502d5cd2cfde5e7726496a399dc1eef91d06
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/core/class/commonobject.class.php
Log Message:
-----------
Fix add Croatia into list of country in EEC
Commit: 70b57322a251e68bd9fddc349b8d6fdd108d59ca
https://github.com/Dolibarr/dolibarr/commit/70b57322a251e68bd9fddc349b8d6fdd108d59ca
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/core/lib/price.lib.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: cdaccf7c4b00251ba50a9ed5a9d30437840a7fb1
https://github.com/Dolibarr/dolibarr/commit/cdaccf7c4b00251ba50a9ed5a9d30437840a7fb1
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
Fix: markRate can be 100
Commit: 801e2bca4b4b844c419889b03b7eba0e1d34d3bf
https://github.com/Dolibarr/dolibarr/commit/801e2bca4b4b844c419889b03b7eba0e1d34d3bf
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M htdocs/core/tpl/objectline_edit.tpl.php
Log Message:
-----------
Fix #4239
Commit: a9f0d6964a0d53de254a2fe6ccd191dffad96195
https://github.com/Dolibarr/dolibarr/commit/a9f0d6964a0d53de254a2fe6ccd191dffad96195
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M ChangeLog
M htdocs/admin/agenda_extsites.php
M htdocs/categories/class/categorie.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/price.lib.php
M htdocs/fourn/facture/card.php
M htdocs/holiday/card.php
M htdocs/holiday/list.php
M htdocs/main.inc.php
M htdocs/public/cron/cron_run_jobs.php
M htdocs/societe/consumption.php
M htdocs/viewimage.php
Log Message:
-----------
Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8
Commit: 861376e4613b9cf8d7e69203536314457330c1da
https://github.com/Dolibarr/dolibarr/commit/861376e4613b9cf8d7e69203536314457330c1da
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-10 (Sun, 10 Jan 2016)
Changed paths:
M ChangeLog
M htdocs/admin/agenda_extsites.php
M htdocs/admin/dict.php
M htdocs/main.inc.php
Log Message:
-----------
Merge branch '3.7' of github.com:Dolibarr/dolibarr into 3.7
Commit: 7281338f8d4c9cb937fabdfda4f435309cdd1b43
https://github.com/Dolibarr/dolibarr/commit/7281338f8d4c9cb937fabdfda4f435309cdd1b43
Author: Raphaël Doursenaud <address@hidden>
Date: 2016-01-11 (Mon, 11 Jan 2016)
Changed paths:
M htdocs/compta/bank/card.php
Log Message:
-----------
FIX #4291 Correctly filter bank card GETPOSTs
Commit: 7552fa20ebdfff06c0095a3fac04c2a0759186b6
https://github.com/Dolibarr/dolibarr/commit/7552fa20ebdfff06c0095a3fac04c2a0759186b6
Author: aspangaro <address@hidden>
Date: 2016-01-11 (Mon, 11 Jan 2016)
Changed paths:
M htdocs/expensereport/list.php
Log Message:
-----------
Fix: #4394 Untranslated label in list of expense reports
Commit: 92885065c6595a7fe4076c9568424915e3dd690a
https://github.com/Dolibarr/dolibarr/commit/92885065c6595a7fe4076c9568424915e3dd690a
Author: Frédéric FRANCE <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Update facture.php
Commit: f280061a903ccf4bd04d26900548d566fd3c3a4a
https://github.com/Dolibarr/dolibarr/commit/f280061a903ccf4bd04d26900548d566fd3c3a4a
Author: phf <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
FIX if we dont use SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE the hour is
displayed on pdf
Commit: 79992b494793747a54a0cba8d26c5fc1f1599f55
https://github.com/Dolibarr/dolibarr/commit/79992b494793747a54a0cba8d26c5fc1f1599f55
Author: fmarcet <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/societe/index.php
Log Message:
-----------
FIX: The third dashboard don't consider user permissions
Commit: 5b26f456f42fd2d05602afad83bfc152ee1e5238
https://github.com/Dolibarr/dolibarr/commit/5b26f456f42fd2d05602afad83bfc152ee1e5238
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/compta/bank/card.php
Log Message:
-----------
Merge pull request #4356 from GPCsolutions/3.8-4291
FIX #4291 Correctly filter bank card GETPOSTs
Commit: 85747c73831bd5741121aa1e78e4110c41ddb510
https://github.com/Dolibarr/dolibarr/commit/85747c73831bd5741121aa1e78e4110c41ddb510
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/expensereport/list.php
Log Message:
-----------
Merge pull request #4400 from aspangaro/3.8-p1
Fix: #4394 Untranslated label in list of expense reports
Commit: 1b1bd73e6b6af8688ab79915059f63c94d534e9c
https://github.com/Dolibarr/dolibarr/commit/1b1bd73e6b6af8688ab79915059f63c94d534e9c
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/compta/facture.php
Log Message:
-----------
Merge pull request #4404 from frederic34/patch-8
FIX When doing payment for money back, bank account was not set by default
Commit: 93ed7c098beee79f7365aa6cdf1180f8ef2be17b
https://github.com/Dolibarr/dolibarr/commit/93ed7c098beee79f7365aa6cdf1180f8ef2be17b
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
Log Message:
-----------
Merge pull request #4407 from atm-ph/fix_3.8_pdf_muscadet_use_hour
FIX pdf_muscadet delivery hour
Commit: 947f718329b436a5190886984f1370fa9f47d25d
https://github.com/Dolibarr/dolibarr/commit/947f718329b436a5190886984f1370fa9f47d25d
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-12 (Tue, 12 Jan 2016)
Changed paths:
M htdocs/societe/index.php
Log Message:
-----------
Merge pull request #4408 from fmarcet/3.7
FIX: The third dashboard don't consider user permissions
Commit: 9b682e095f02d78f937e1f2bf49b4d9400e19fbd
https://github.com/Dolibarr/dolibarr/commit/9b682e095f02d78f937e1f2bf49b4d9400e19fbd
Author: phf <address@hidden>
Date: 2016-01-13 (Wed, 13 Jan 2016)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
FIX can't clone event
Commit: 004285c6b4211cd090575a5e84a3f9b4b56fe25c
https://github.com/Dolibarr/dolibarr/commit/004285c6b4211cd090575a5e84a3f9b4b56fe25c
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-13 (Wed, 13 Jan 2016)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
Merge pull request #4412 from atm-ph/fix_3.8_clone_event
FIX can't clone event
Commit: 3a3ae90a0abc118427de0fa65ef03b6bfc5ac5aa
https://github.com/Dolibarr/dolibarr/commit/3a3ae90a0abc118427de0fa65ef03b6bfc5ac5aa
Author: Regis Houssin <address@hidden>
Date: 2016-01-13 (Wed, 13 Jan 2016)
Changed paths:
M htdocs/opensurvey/wizard/index.php
Log Message:
-----------
Fix: ajax error with multicompany module
Commit: d98415f9b568d5c8c1dd81a84d8cedaab3aca063
https://github.com/Dolibarr/dolibarr/commit/d98415f9b568d5c8c1dd81a84d8cedaab3aca063
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-14 (Thu, 14 Jan 2016)
Changed paths:
M htdocs/opensurvey/wizard/index.php
Log Message:
-----------
Merge pull request #4413 from hregis/3.8_bug
Fix: ajax error with multicompany module
Commit: 8b2541ebf92edff44999abd4a082d38870a2ab0e
https://github.com/Dolibarr/dolibarr/commit/8b2541ebf92edff44999abd4a082d38870a2ab0e
Author: arnaud <address@hidden>
Date: 2016-01-14 (Thu, 14 Jan 2016)
Changed paths:
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Log Message:
-----------
FIX nblignes not calculated after hook and hook can't modify this value.
Usefull for modules
Commit: d46c655fb4893a3fa3dbbd0b630edda068aea1ba
https://github.com/Dolibarr/dolibarr/commit/d46c655fb4893a3fa3dbbd0b630edda068aea1ba
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-16 (Sat, 16 Jan 2016)
Changed paths:
M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
Log Message:
-----------
FIX: Sql syntax error in doc_generic_task_odt
Commit: be4f9baac69c9a6fcc06a8099b17dbe22e1f7002
https://github.com/Dolibarr/dolibarr/commit/be4f9baac69c9a6fcc06a8099b17dbe22e1f7002
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-16 (Sat, 16 Jan 2016)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/compta/bank/card.php
M htdocs/compta/facture.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/expensereport/list.php
M htdocs/opensurvey/wizard/index.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: af4d57b461ad0634aeee85169df66623b36ed21a
https://github.com/Dolibarr/dolibarr/commit/af4d57b461ad0634aeee85169df66623b36ed21a
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-16 (Sat, 16 Jan 2016)
Changed paths:
A dev/initdata/img/applepieproduct.jpg
A dev/initdata/img/dolidroid_114x114.png
A dev/initdata/img/dolidroid_512x512_en.png
A dev/initdata/img/dolidroid_screenshot_home_720x1280.png
A dev/initdata/img/genericcustomer.png
A dev/initdata/img/indiancompany.png
A dev/initdata/img/logo_nltechno_94x100.png
A dev/initdata/img/nocountrycomp.png
A dev/initdata/img/pearpieproduct.jpg
A dev/initdata/img/pinkdressproduct.jpg
M dev/initdata/img/printcompany.png
A dev/initdata/img/rolluproduct.jpg
A dev/initdata/img/spanishcompany.png
A dev/initdata/img/swisstouch.png
A dev/initdata/img/teclibcompany.png
Log Message:
-----------
Complete demo samples
Commit: 4d2b5d71afee433b40bed2d2980dba3493efeacd
https://github.com/Dolibarr/dolibarr/commit/4d2b5d71afee433b40bed2d2980dba3493efeacd
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-17 (Sun, 17 Jan 2016)
Changed paths:
M htdocs/langs/en_US/sms.lang
Log Message:
-----------
Fix missing translation key
Commit: 2386b79dfc34cc24d0ddd85f21a480c4e343e9ac
https://github.com/Dolibarr/dolibarr/commit/2386b79dfc34cc24d0ddd85f21a480c4e343e9ac
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-18 (Mon, 18 Jan 2016)
Changed paths:
M htdocs/admin/delais.php
Log Message:
-----------
FIX Option to disable meteo was not set correctly in edit mode
Commit: 219ce73ea2903292ed62fd705dd1b4fc69f12110
https://github.com/Dolibarr/dolibarr/commit/219ce73ea2903292ed62fd705dd1b4fc69f12110
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Log Message:
-----------
Merge pull request #4417 from atm-arnaud/3.8_fix_factures_nblignes_after_hook
FIX nblignes not calculated after hook and hook can't modify this val...
Commit: 34c648b351169127324a4e95c1c9a4337e297521
https://github.com/Dolibarr/dolibarr/commit/34c648b351169127324a4e95c1c9a4337e297521
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
FIX #4418
Commit: 56a4466b5b976a3ab92ea707f28909dda19307f2
https://github.com/Dolibarr/dolibarr/commit/56a4466b5b976a3ab92ea707f28909dda19307f2
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Log Message:
-----------
Merge branch '3.8' of address@hidden:Dolibarr/dolibarr.git into 3.8
Commit: cbd01bae49eb05e927cde290d3e47dd0678780e3
https://github.com/Dolibarr/dolibarr/commit/cbd01bae49eb05e927cde290d3e47dd0678780e3
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
M htdocs/admin/dict.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/societe/index.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/admin/dict.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/societe/index.php
Commit: cceeefb7c2670629be0b2304ba14a435fbe29f57
https://github.com/Dolibarr/dolibarr/commit/cceeefb7c2670629be0b2304ba14a435fbe29f57
Author: Laurent Destailleur <address@hidden>
Date: 2016-01-22 (Fri, 22 Jan 2016)
Changed paths:
A dev/initdata/img/applepieproduct.jpg
A dev/initdata/img/dolidroid_114x114.png
A dev/initdata/img/dolidroid_512x512_en.png
A dev/initdata/img/dolidroid_screenshot_home_720x1280.png
A dev/initdata/img/genericcustomer.png
A dev/initdata/img/indiancompany.png
A dev/initdata/img/logo_nltechno_94x100.png
A dev/initdata/img/nocountrycomp.png
A dev/initdata/img/pearpieproduct.jpg
A dev/initdata/img/pinkdressproduct.jpg
M dev/initdata/img/printcompany.png
A dev/initdata/img/rolluproduct.jpg
A dev/initdata/img/spanishcompany.png
A dev/initdata/img/swisstouch.png
A dev/initdata/img/teclibcompany.png
M htdocs/admin/delais.php
M htdocs/admin/dict.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/compta/bank/card.php
M htdocs/compta/facture.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/price.lib.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/expensereport/list.php
M htdocs/fourn/facture/card.php
M htdocs/langs/en_US/sms.lang
M htdocs/opensurvey/wizard/index.php
M htdocs/societe/index.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.8' into 3.9
Conflicts:
htdocs/societe/index.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/d857b3475b18...cceeefb7c267