[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 307c06: FIX : pdf invoice when we use
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 307c06: FIX : pdf invoice when we use situation |
|
Date: |
Sat, 21 Jan 2017 03:27:03 -0800 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 307c06dfc36c50cf2e9d9e7cf2d923f55013dcb3
https://github.com/Dolibarr/dolibarr/commit/307c06dfc36c50cf2e9d9e7cf2d923f55013dcb3
Author: gauthier <address@hidden>
Date: 2017-01-12 (Thu, 12 Jan 2017)
Changed paths:
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Log Message:
-----------
FIX : pdf invoice when we use situation
Commit: 1886e68731e9737d0ce5ef25e36585aced5003be
https://github.com/Dolibarr/dolibarr/commit/1886e68731e9737d0ce5ef25e36585aced5003be
Author: gauthier <address@hidden>
Date: 2017-01-12 (Thu, 12 Jan 2017)
Changed paths:
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Log Message:
-----------
FIX : progress size
Commit: a90ec7a8c736a3b330c01a253e132453c3e321d2
https://github.com/Dolibarr/dolibarr/commit/a90ec7a8c736a3b330c01a253e132453c3e321d2
Author: gauthier <address@hidden>
Date: 2017-01-13 (Fri, 13 Jan 2017)
Changed paths:
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Log Message:
-----------
FIX : hidetop progression
Commit: 487b5b25dbf9457228e1ad55c737de9dd927714f
https://github.com/Dolibarr/dolibarr/commit/487b5b25dbf9457228e1ad55c737de9dd927714f
Author: altatof <address@hidden>
Date: 2017-01-13 (Fri, 13 Jan 2017)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
FIX: extrafield input for varchar was not working with special char
within (ie double quotes)
Commit: 55c0a99bce46ae767e86069cc7823b307f0f1654
https://github.com/Dolibarr/dolibarr/commit/55c0a99bce46ae767e86069cc7823b307f0f1654
Author: altatof <address@hidden>
Date: 2017-01-13 (Fri, 13 Jan 2017)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
fix was not at the right place
Commit: 3dd160c6635ebd7eb69bf9defc194eb442229db6
https://github.com/Dolibarr/dolibarr/commit/3dd160c6635ebd7eb69bf9defc194eb442229db6
Author: altatof <address@hidden>
Date: 2017-01-16 (Mon, 16 Jan 2017)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
use dol_escape_htmltag
Commit: 9c60474953b5aa0d393d4d93d1fb3abafcf405d2
https://github.com/Dolibarr/dolibarr/commit/9c60474953b5aa0d393d4d93d1fb3abafcf405d2
Author: Laurent Destailleur <address@hidden>
Date: 2017-01-16 (Mon, 16 Jan 2017)
Changed paths:
M htdocs/fourn/commande/dispatch.php
Log Message:
-----------
FIX #6277
Commit: fdbe4051f135d5cda58314721a1c8d5774f45d99
https://github.com/Dolibarr/dolibarr/commit/fdbe4051f135d5cda58314721a1c8d5774f45d99
Author: Laurent Destailleur <address@hidden>
Date: 2017-01-16 (Mon, 16 Jan 2017)
Changed paths:
M htdocs/user/class/user.class.php
Log Message:
-----------
FIX #6230
Commit: d21bb1e6b1ebea6efa3f9460ee908441440b792f
https://github.com/Dolibarr/dolibarr/commit/d21bb1e6b1ebea6efa3f9460ee908441440b792f
Author: Laurent Destailleur <address@hidden>
Date: 2017-01-16 (Mon, 16 Jan 2017)
Changed paths:
M htdocs/fichinter/card.php
Log Message:
-----------
FIX #6237
Commit: 03c1521cdeb5fdc7ddc0ff0e6f5e06939a089f8b
https://github.com/Dolibarr/dolibarr/commit/03c1521cdeb5fdc7ddc0ff0e6f5e06939a089f8b
Author: Laurent Destailleur <address@hidden>
Date: 2017-01-18 (Wed, 18 Jan 2017)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge pull request #6271 from altatof/fix_extra_input
FIX: extrafield input for varchar was not working with special char
Commit: a944c82d86a54c3f217910e21b65ff6a6a105313
https://github.com/Dolibarr/dolibarr/commit/a944c82d86a54c3f217910e21b65ff6a6a105313
Author: gauthier <address@hidden>
Date: 2017-01-19 (Thu, 19 Jan 2017)
Changed paths:
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Log Message:
-----------
FIX : $progress_width initialized
Commit: 2cedcfece2c3a9f41c5385176e6e66d72969dd55
https://github.com/Dolibarr/dolibarr/commit/2cedcfece2c3a9f41c5385176e6e66d72969dd55
Author: arnaud <address@hidden>
Date: 2017-01-20 (Fri, 20 Jan 2017)
Changed paths:
M htdocs/margin/agentMargins.php
Log Message:
-----------
FIX bug margin calcul by user with multicompany
Commit: ac321617117bca763305e4e18f32072d525ca940
https://github.com/Dolibarr/dolibarr/commit/ac321617117bca763305e4e18f32072d525ca940
Author: Laurent Destailleur <address@hidden>
Date: 2017-01-20 (Fri, 20 Jan 2017)
Changed paths:
M htdocs/core/lib/date.lib.php
M htdocs/projet/tasks/list.php
Log Message:
-----------
Fix error in total of tasks
Commit: a47f3cb0e59d6d0ff7a35e7d2ac90ea77470ac1e
https://github.com/Dolibarr/dolibarr/commit/a47f3cb0e59d6d0ff7a35e7d2ac90ea77470ac1e
Author: Laurent Destailleur <address@hidden>
Date: 2017-01-20 (Fri, 20 Jan 2017)
Changed paths:
M htdocs/margin/agentMargins.php
Log Message:
-----------
Merge pull request #6309 from
atm-arnaud/FIX_calcul_marge_by_user_with_multicompany
FIX bug margin calcul by user with multicompany
Commit: 5715233fb02eac74b4bad44f6a4debc8025ef8d8
https://github.com/Dolibarr/dolibarr/commit/5715233fb02eac74b4bad44f6a4debc8025ef8d8
Author: Speed <address@hidden>
Date: 2017-01-20 (Fri, 20 Jan 2017)
Changed paths:
M scripts/members/sync_members_ldap2dolibarr.php
Log Message:
-----------
Updated script sync members from LDAP
Replace "Cotisation" class with its new name "Subscription"
Commit: f23f2e61f579d1f3cedcb1628c39723be5154e31
https://github.com/Dolibarr/dolibarr/commit/f23f2e61f579d1f3cedcb1628c39723be5154e31
Author: Ion <address@hidden>
Date: 2017-01-20 (Fri, 20 Jan 2017)
Changed paths:
M htdocs/fourn/facture/card.php
Log Message:
-----------
Fix #6161 supplier order to facture not working
Commit: 0a4b29e1c429aca0d330d2f876d44db92a475af3
https://github.com/Dolibarr/dolibarr/commit/0a4b29e1c429aca0d330d2f876d44db92a475af3
Author: Laurent Destailleur <address@hidden>
Date: 2017-01-20 (Fri, 20 Jan 2017)
Changed paths:
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
Log Message:
-----------
Merge pull request #6284 from atm-gauthier/FIX_pdf_invoice_with_situation
Fix pdf invoice with situation
Commit: 809e3ce4d544ded2cd59fc1b5ba744f72304a970
https://github.com/Dolibarr/dolibarr/commit/809e3ce4d544ded2cd59fc1b5ba744f72304a970
Author: Laurent Destailleur <address@hidden>
Date: 2017-01-20 (Fri, 20 Jan 2017)
Changed paths:
M htdocs/admin/agenda_other.php
R htdocs/comm/action/sound/notification.mp3
R htdocs/core/ajax/check_events.php
A htdocs/core/ajax/check_notifications.php
R htdocs/core/js/agenda_notification.js.php
A htdocs/core/js/lib_notification.js.php
M htdocs/core/modules/modAgenda.class.php
M htdocs/langs/en_US/admin.lang
M htdocs/main.inc.php
A htdocs/theme/common/sound/notification.mp3
A htdocs/theme/common/sound/notification_agenda.wav
Log Message:
-----------
Debug browser notification
Commit: 9ebe383beb7a8273be10389ce5d9eb51bbc91c2d
https://github.com/Dolibarr/dolibarr/commit/9ebe383beb7a8273be10389ce5d9eb51bbc91c2d
Author: Laurent Destailleur <address@hidden>
Date: 2017-01-20 (Fri, 20 Jan 2017)
Changed paths:
M htdocs/margin/agentMargins.php
Log Message:
-----------
Merge branch '3.9' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: eb09519a26a44c10d42445fed6bc65745b06a030
https://github.com/Dolibarr/dolibarr/commit/eb09519a26a44c10d42445fed6bc65745b06a030
Author: Laurent Destailleur <address@hidden>
Date: 2017-01-20 (Fri, 20 Jan 2017)
Changed paths:
M htdocs/core/class/extrafields.class.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 4.0
Commit: fc4aa96cd7cf74277c6168475428657aea161de8
https://github.com/Dolibarr/dolibarr/commit/fc4aa96cd7cf74277c6168475428657aea161de8
Author: Laurent Destailleur <address@hidden>
Date: 2017-01-20 (Fri, 20 Jan 2017)
Changed paths:
M htdocs/core/class/extrafields.class.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/dispatch.php
M htdocs/margin/agentMargins.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge branch '4.0' of address@hidden:Dolibarr/dolibarr.git into 5.0
Conflicts:
htdocs/core/class/extrafields.class.php
htdocs/fichinter/card.php
htdocs/fourn/commande/dispatch.php
Commit: 1add34b451bece75bdb3164d0ec2a7c3e2f34d34
https://github.com/Dolibarr/dolibarr/commit/1add34b451bece75bdb3164d0ec2a7c3e2f34d34
Author: Laurent Destailleur <address@hidden>
Date: 2017-01-20 (Fri, 20 Jan 2017)
Changed paths:
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
Log Message:
-----------
Fix multicompany
Commit: 9a5670787f83cced02e0ed4692b5edcfa93bad2c
https://github.com/Dolibarr/dolibarr/commit/9a5670787f83cced02e0ed4692b5edcfa93bad2c
Author: Laurent Destailleur <address@hidden>
Date: 2017-01-21 (Sat, 21 Jan 2017)
Changed paths:
M htdocs/core/class/extrafields.class.php
M htdocs/core/modules/facture/doc/pdf_crabe.modules.php
M htdocs/fichinter/card.php
M htdocs/fourn/commande/dispatch.php
M htdocs/margin/agentMargins.php
M htdocs/margin/customerMargins.php
M htdocs/margin/productMargins.php
M htdocs/user/class/user.class.php
Log Message:
-----------
Merge branch '5.0' of address@hidden:Dolibarr/dolibarr.git into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/b602e04fc8ab...9a5670787f83