stickler-ci
|
ca557cfacd
|
Fixing style errors.
|
2021-01-06 13:22:35 +00:00 |
|
quentin
|
e44b14364a
|
FIX useless tracking number displayed on pdf if empty
|
2021-01-06 14:17:06 +01:00 |
|
Laurent Destailleur
|
26f07992a9
|
Reduce travis load for v11
|
2020-11-27 00:27:52 +01:00 |
|
Laurent Destailleur
|
7fdc63faa6
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-11-15 23:48:52 +01:00 |
|
Laurent Destailleur
|
556888d55c
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2020-11-15 23:48:18 +01:00 |
|
Laurent Destailleur
|
5e1cd459b1
|
Fix travis
|
2020-11-15 23:47:53 +01:00 |
|
Laurent Destailleur
|
dff5b13700
|
Merge pull request #15418 from atm-maxime/fix_ticket_list_filter
Fix #15377 ticket list filter on author
|
2020-11-15 17:01:47 +01:00 |
|
Maxime Kohlhaas
|
44c5988853
|
Fix #15377 ticket list filter on author
|
2020-11-15 10:42:15 +01:00 |
|
Laurent Destailleur
|
2907df8253
|
Merge pull request #15364 from frederic34/patch-15
Fix missing getpost for scandir odt path
|
2020-11-12 12:33:59 +01:00 |
|
Frédéric FRANCE
|
ad05451427
|
Fix missing getpost for scandir odt path
|
2020-11-12 11:23:03 +01:00 |
|
Laurent Destailleur
|
2db08c8e0d
|
Merge pull request #15341 from atm-quentin/FIX/HeightForTotWhenTooMuchPayment
FIX : handling $heightforinfotot when he's superior to a page height
|
2020-11-10 14:38:39 +01:00 |
|
quentin
|
fb27c98f9c
|
FIX : handling $heightforinfotot when he's superior to a page height
|
2020-11-10 09:40:45 +01:00 |
|
Laurent Destailleur
|
8458025e1d
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-11-09 19:47:33 +01:00 |
|
Laurent Destailleur
|
4a5c7d299f
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/accountancy/class/accountancyexport.class.php
|
2020-11-09 19:47:25 +01:00 |
|
Laurent Destailleur
|
18d4840f85
|
Merge pull request #15334 from aspangaro/10_p57
FIX: Accountancy - Some ajustments on length of the account (general & auxiliary)
|
2020-11-09 19:02:35 +01:00 |
|
Laurent Destailleur
|
c529a92b92
|
Merge pull request #15333 from atm-gauthier/11.0_fix_disabled_sales_representative
FIX : disabled users must not be available in sales representative list on societe edit mode
|
2020-11-09 19:02:01 +01:00 |
|
Alexandre SPANGARO
|
0a078da8e4
|
FIX: Accountancy - Some ajustments on length of the account
|
2020-11-09 14:59:29 +01:00 |
|
Alexandre SPANGARO
|
617c930574
|
FIX: Accountancy - Some ajustments on length of the account (general & auxiliary)
|
2020-11-09 14:13:09 +01:00 |
|
Got2be
|
2f11f4e104
|
FIX : disabled users must not be available in sales representative list on societe edit mode
|
2020-11-09 11:22:07 +01:00 |
|
Laurent Destailleur
|
a017943083
|
Merge pull request #15321 from atm-lena/11.0_FIX_BoxBirthdayAndSocCommercial_UserStatus
FIX - Don't display inactive users in birthday box and company card
|
2020-11-06 18:43:56 +01:00 |
|
atm-lena
|
047785b273
|
FIX - Don't display inactive users in birthday box and soc card
|
2020-11-06 11:58:36 +01:00 |
|
Laurent Destailleur
|
6bb598498e
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-11-05 09:42:51 +01:00 |
|
Laurent Destailleur
|
f25a6b2e67
|
Merge pull request #15213 from ATM-Consulting/fix/10.0_delete_action_from_redirect_url_when_reordering_lines
FIX - 10.0 - remove 'action' parameter from redirect URL when reordering lines
|
2020-11-02 09:41:00 +01:00 |
|
Florian Mortgat
|
400acf9f65
|
FIX - 10.0 - regex to remove 'action' parameter: taking feedback from PR#15213 into account
|
2020-11-02 08:26:36 +01:00 |
|
Laurent Destailleur
|
d9ca9fe22d
|
Fix clean of contract
|
2020-10-30 14:50:38 +01:00 |
|
Laurent Destailleur
|
f51b02026c
|
Fix regression
|
2020-10-30 04:24:06 +01:00 |
|
Laurent Destailleur
|
f5a156ee06
|
Fix regression
|
2020-10-30 04:17:02 +01:00 |
|
Laurent Destailleur
|
1b5bcaccc6
|
Fix remove warnings
|
2020-10-30 04:13:31 +01:00 |
|
Laurent Destailleur
|
263b679af4
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/tpl/advtarget.tpl.php
|
2020-10-30 03:31:04 +01:00 |
|
Laurent Destailleur
|
925669ee33
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-10-30 03:25:52 +01:00 |
|
Laurent Destailleur
|
f22017080d
|
Fix for php8
|
2020-10-30 03:25:33 +01:00 |
|
Laurent Destailleur
|
d7ac505cd0
|
Merge pull request #15202 from ATM-Consulting/fix/10.0_make_formConfirm_an_addreplace_hook_2
FIX 10.0 - make formConfirm an addreplace-type hook
|
2020-10-29 17:47:56 +01:00 |
|
Laurent Destailleur
|
e79a061c19
|
Merge pull request #15204 from frederic34/patch-6
Update timeline.inc.php
|
2020-10-29 17:46:31 +01:00 |
|
Laurent Destailleur
|
d7225327e7
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-10-29 11:13:29 +01:00 |
|
Laurent Destailleur
|
2a386b6fea
|
Fix set subledger account
|
2020-10-29 11:13:18 +01:00 |
|
Laurent Destailleur
|
91cf5de54d
|
Fix bad sort order
|
2020-10-29 11:06:18 +01:00 |
|
Laurent Destailleur
|
980cb095da
|
Fix sort order use last sortorder if several fields.
|
2020-10-29 11:05:43 +01:00 |
|
Florian Mortgat
|
5e2962ef38
|
FIX - 10.0 - remove 'action' parameter from redirect URL when reordering lines on a document
|
2020-10-29 10:50:13 +01:00 |
|
Laurent Destailleur
|
b1b7a7c725
|
Fix missing transaction
|
2020-10-29 10:40:50 +01:00 |
|
Laurent Destailleur
|
89dcbfae82
|
Merge pull request #15212 from Dolibarr/revert-15182-FIX_11.0_various_payment_subledger
Revert "FIX: various payments: bad data handling for subledger account + useless db commit/rollback"
|
2020-10-29 10:37:33 +01:00 |
|
Laurent Destailleur
|
c3f0f3cc4a
|
Revert "FIX: various payments: bad data handling for subledger account + useless db commit/rollback"
|
2020-10-29 10:36:48 +01:00 |
|
Frédéric FRANCE
|
20c00d0c43
|
Update timeline.inc.php
|
2020-10-28 17:54:45 +01:00 |
|
Florian Mortgat
|
a4af2e94a9
|
FIX 10.0 - make formConfirm an addreplace-type hook
|
2020-10-28 17:08:09 +01:00 |
|
Laurent Destailleur
|
866934e6c5
|
Merge pull request #15182 from marc-dll/FIX_11.0_various_payment_subledger
FIX: various payments: bad data handling for subledger account + useless db commit/rollback
|
2020-10-27 18:07:47 +01:00 |
|
Marc de Lima Lucio
|
a33d34a165
|
FIX: various payments: bad data handling for subledger account + useless db commit/rollback
|
2020-10-27 16:48:56 +01:00 |
|
Laurent Destailleur
|
027c5582c3
|
Merge pull request #15178 from frederic34/patch-6
dol_print_date called with a bad value
|
2020-10-27 11:55:07 +01:00 |
|
Frédéric FRANCE
|
da4f3fab14
|
dol_print_date called with a bad value
|
2020-10-27 08:10:19 +01:00 |
|
Laurent Destailleur
|
12289ceb9e
|
Merge pull request #15159 from Ahuahuachi/10.0
FIX #15111 Fix special characters output in PDF
|
2020-10-26 19:20:53 +01:00 |
|
Laurent Destailleur
|
e57cd74f22
|
Merge pull request #15166 from atm-quentin/FIX_select2_extra_witdh_on_advtargetmailing
FIX table making extrafield input too small on advance target mailing
|
2020-10-26 19:11:37 +01:00 |
|
Laurent Destailleur
|
78a52eda96
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/main.inc.php
htdocs/product/class/productcustomerprice.class.php
|
2020-10-26 19:05:30 +01:00 |
|