[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] db54b6: Fix: [ bug #3198 ] Trigger LI
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] db54b6: Fix: [ bug #3198 ] Trigger LINECONTRACT_INSERT pas... |
Date: |
Tue, 28 Jul 2015 09:57:26 -0700 |
Branch: refs/heads/3.8
Home: https://github.com/Dolibarr/dolibarr
Commit: db54b6f596ba80d06740885e1baab5e8fc53bc72
https://github.com/Dolibarr/dolibarr/commit/db54b6f596ba80d06740885e1baab5e8fc53bc72
Author: Marcos García de La Fuente <address@hidden>
Date: 2015-07-20 (Mon, 20 Jul 2015)
Changed paths:
M ChangeLog
M htdocs/contrat/class/contrat.class.php
Log Message:
-----------
Fix: [ bug #3198 ] Trigger LINECONTRACT_INSERT passes Contrat as $object
instead of ContratLigne
Created new ContratLigne::insert function
Close #3198
Commit: 9e35fd1bc3779ffaec9b09344956cf0ea8e7008c
https://github.com/Dolibarr/dolibarr/commit/9e35fd1bc3779ffaec9b09344956cf0ea8e7008c
Author: Laurent Destailleur <address@hidden>
Date: 2015-07-21 (Tue, 21 Jul 2015)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
Log Message:
-----------
Doc comments
Commit: fa26b284a9ddfc978ef65187f9e1643a4eba7806
https://github.com/Dolibarr/dolibarr/commit/fa26b284a9ddfc978ef65187f9e1643a4eba7806
Author: Gauthier <address@hidden>
Date: 2015-07-21 (Tue, 21 Jul 2015)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
FIX : Line break display as a block
Commit: 96f1c25a730ab4d4e019cde7ef078e8d8686b8a3
https://github.com/Dolibarr/dolibarr/commit/96f1c25a730ab4d4e019cde7ef078e8d8686b8a3
Author: Laurent Destailleur <address@hidden>
Date: 2015-07-23 (Thu, 23 Jul 2015)
Changed paths:
M ChangeLog
M htdocs/contrat/class/contrat.class.php
Log Message:
-----------
Merge pull request #3287 from marcosgdf/bug-3198
Fix: [ bug #3198 ] Trigger LINECONTRACT_INSERT passes Contrat as $object
instead of ContratLigne
Commit: c0412acdea3ee24faf0a8cb0909508c49eb685fc
https://github.com/Dolibarr/dolibarr/commit/c0412acdea3ee24faf0a8cb0909508c49eb685fc
Author: Florian HENRY <address@hidden>
Date: 2015-07-27 (Mon, 27 Jul 2015)
Changed paths:
M htdocs/adherents/admin/public.php
Log Message:
-----------
FIX : #3318
Commit: e130af80336025a5fe20278ecbb18156e9c37287
https://github.com/Dolibarr/dolibarr/commit/e130af80336025a5fe20278ecbb18156e9c37287
Author: fmarcet <address@hidden>
Date: 2015-07-27 (Mon, 27 Jul 2015)
Changed paths:
M ChangeLog
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
Log Message:
-----------
Fix: Not showing delivery date on rouget pdf (expedition)
Commit: d78292b9af3b5e477ae4587fc9cc08dd79896055
https://github.com/Dolibarr/dolibarr/commit/d78292b9af3b5e477ae4587fc9cc08dd79896055
Author: Florian HENRY <address@hidden>
Date: 2015-07-27 (Mon, 27 Jul 2015)
Changed paths:
M htdocs/main.inc.php
Log Message:
-----------
FIX : if multicompany enabled, call to undifend method _setCookie
instead of setCookie
Commit: 517e9094da6fcee5c3594140f2f965550b7d282e
https://github.com/Dolibarr/dolibarr/commit/517e9094da6fcee5c3594140f2f965550b7d282e
Author: Florian HENRY <address@hidden>
Date: 2015-07-27 (Mon, 27 Jul 2015)
Changed paths:
M htdocs/core/lib/json.lib.php
Log Message:
-----------
FIX : Avoid warning strict mode when hosting server do not have
php5_curl installed
Commit: 556d01ff8abdfd91794d2da7d708ef02b61b24a9
https://github.com/Dolibarr/dolibarr/commit/556d01ff8abdfd91794d2da7d708ef02b61b24a9
Author: Gauthier <address@hidden>
Date: 2015-07-28 (Tue, 28 Jul 2015)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
FIX : Line break display as a block
Commit: aaa9d85d079651f848a00a8fdb4af459036359d6
https://github.com/Dolibarr/dolibarr/commit/aaa9d85d079651f848a00a8fdb4af459036359d6
Author: Gauthier <address@hidden>
Date: 2015-07-28 (Tue, 28 Jul 2015)
Changed paths:
M htdocs/comm/action/card.php
Log Message:
-----------
FIX : When we add an user on event in create mode, we lose linked object
Commit: a3b379476b39eefca62a4d47e90b717d179fba55
https://github.com/Dolibarr/dolibarr/commit/a3b379476b39eefca62a4d47e90b717d179fba55
Author: Laurent Destailleur <address@hidden>
Date: 2015-07-28 (Tue, 28 Jul 2015)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge pull request #3308 from
atm-gauthier/3.7_fix_display_extraf_text_line_break
FIX : Line break display as a block
Commit: c42e952ce92d32af0d1296a43ccf4107a3d31cc8
https://github.com/Dolibarr/dolibarr/commit/c42e952ce92d32af0d1296a43ccf4107a3d31cc8
Author: Laurent Destailleur <address@hidden>
Date: 2015-07-28 (Tue, 28 Jul 2015)
Changed paths:
M htdocs/adherents/admin/public.php
M htdocs/core/lib/json.lib.php
M htdocs/main.inc.php
Log Message:
-----------
Merge pull request #3319 from FHenry/3.7
FIX : #3318
Commit: bd4a31c45db5dee7375e15c099a094d89f5f9da0
https://github.com/Dolibarr/dolibarr/commit/bd4a31c45db5dee7375e15c099a094d89f5f9da0
Author: Laurent Destailleur <address@hidden>
Date: 2015-07-28 (Tue, 28 Jul 2015)
Changed paths:
M ChangeLog
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
Log Message:
-----------
Merge pull request #3320 from fmarcet/3.7
Fix: Not showing delivery date on rouget pdf (expedition)
Commit: cc49b39eb655831de33dc277f2dceef0f9eed935
https://github.com/Dolibarr/dolibarr/commit/cc49b39eb655831de33dc277f2dceef0f9eed935
Author: Laurent Destailleur <address@hidden>
Date: 2015-07-28 (Tue, 28 Jul 2015)
Changed paths:
M htdocs/comm/action/card.php
Log Message:
-----------
Merge pull request #3329 from
atm-gauthier/3.7_fix_add_user_on_event_in_create_mode
FIX : When we add an user on event in create mode, we lose linked object
Commit: ff8969073c08e99969cbc19157f97f71961ac8f0
https://github.com/Dolibarr/dolibarr/commit/ff8969073c08e99969cbc19157f97f71961ac8f0
Author: Laurent Destailleur <address@hidden>
Date: 2015-07-28 (Tue, 28 Jul 2015)
Changed paths:
M ChangeLog
M htdocs/adherents/admin/public.php
M htdocs/comm/action/card.php
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/contrat/class/contrat.class.php
M htdocs/core/class/extrafields.class.php
M htdocs/core/lib/json.lib.php
M htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
Log Message:
-----------
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/core/class/extrafields.class.php
htdocs/main.inc.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/22c68a322175...ff8969073c08