Commit Graph

87885 Commits

Author SHA1 Message Date
Laurent Destailleur
46bb49c490
Merge pull request #15638 from ptibogxiv/patch-396
Fix limit product in customer margins
2020-12-04 18:10:49 +01:00
Laurent Destailleur
628257d771
Merge pull request #15649 from atm-benoit/FIX_SUPPLIER_PROPOSAL
Fix supplier proposal
2020-12-04 18:06:08 +01:00
Laurent Destailleur
2c9e490853
Merge pull request #15643 from atm-benoit/FIX_INSTALL_12_SHIP_MODE
FIX SHIP MODE install v12 bug insert
2020-12-04 15:58:44 +01:00
stickler-ci
ddf82f3e7a Fixing style errors. 2020-12-04 14:45:26 +00:00
atm-benoit
b9461322d9 FIX SUPPLIER PROPOSAL v12 bug add 2020-12-04 15:37:00 +01:00
atm-benoit
575bb7d420 FIX SHIP MODE install v12 bug insert 2020-12-04 14:20:25 +01:00
ptibogxiv
d712e1e6d4
Fix limit product in customer margins
Fix limit of 20 products in product list/search
2020-12-04 09:42:30 +01:00
Laurent Destailleur
ac30348081 Prepare 12.0.4 2020-12-03 19:16:34 +01:00
Laurent Destailleur
df48704154 Fix label 2020-12-03 18:45:56 +01:00
Laurent Destailleur
8a7f7b3551 FIX Request on purchase orders in timeout even on very small databases 2020-12-03 18:38:18 +01:00
Laurent Destailleur
a1428c963b Fix phpcs 2020-12-03 16:53:26 +01:00
Laurent Destailleur
c8eaa4743c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-03 16:35:56 +01:00
Laurent Destailleur
ac29db92cb FIX #15618 2020-12-03 16:35:42 +01:00
Laurent Destailleur
35766fb5bf
Merge pull request #15625 from atm-florianm/FIX/12.0_error_when_adding_lines_on_order
FIX 12.0 - error when displaying lines on order after adding a new line
2020-12-03 14:30:25 +01:00
Laurent Destailleur
068587fcee
Update card.php 2020-12-03 14:30:07 +01:00
Laurent Destailleur
af4f473c93 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/boxes/box_produits.php
2020-12-03 11:22:34 +01:00
Laurent Destailleur
0ad6ee209a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-03 11:21:08 +01:00
Laurent Destailleur
b324425db8 code comment 2020-12-03 11:19:41 +01:00
Laurent Destailleur
0fd865d8af FIX Better error message with IMAP when connection fails 2020-12-03 11:16:02 +01:00
Florian Mortgat
17d5bb5cd4 FIX 12.0 - error when displaying lines on order after adding a line if both MAIN_MULTILANGS and MAIN_DISABLE_PDF_AUTOUPDATE are activated 2020-12-02 22:25:08 +01:00
Laurent Destailleur
589da1d4b9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-02 19:40:19 +01:00
Laurent Destailleur
bc1dc1e9f0 FIX #15590 manually 2020-12-02 19:34:04 +01:00
Laurent Destailleur
8d64485705
Merge pull request #15623 from Dolibarr/revert-15607-12edit-extrafield-computed-multiline
Revert "Create/Edit extra-field with multi-line text area for computed value"
2020-12-02 18:56:06 +01:00
Laurent Destailleur
a2dca42965
Revert "Create/Edit extra-field with multi-line text area for computed value" 2020-12-02 18:55:55 +01:00
Laurent Destailleur
4918b41384
Merge pull request #15607 from StephaneLesage/12edit-extrafield-computed-multiline
Create/Edit extra-field with multi-line text area for computed value
2020-12-02 18:55:47 +01:00
Laurent Destailleur
662fe4c358
Merge pull request #15611 from StephaneLesage/12more_llx_c_shipment_mode.sql
More transporters in llx_c_shipment_mode.sql
2020-12-02 18:33:48 +01:00
Stephane Lesage
1c4876b417 more transporters in llx_c_shipment_mode.sql 2020-12-01 21:17:03 +01:00
Stephane Lesage
3caf65ce6f Create/Edit extra-field with multi-line text area for computed value 2020-12-01 19:30:09 +01:00
Laurent Destailleur
fde7c4ffb3
Merge pull request #15575 from StephaneLesage/fix12-userlist-filter-by-gender
Fix Users list filter by gender
2020-11-30 15:48:06 +01:00
Laurent Destailleur
627d09d75e
Merge pull request #15580 from teleassist/teleassist-12.0Fix15374
FIX #15374 : "New" doesn't clear total amounts
2020-11-30 15:40:19 +01:00
Laurent Destailleur
7870a33fd3
Update invoice.php 2020-11-30 15:39:35 +01:00
stickler-ci
9ee37153f7 Fixing style errors. 2020-11-30 10:32:58 +00:00
teleassist
560194c3b9
FIX #15374 : "New" doesn't clear total amounts
Invoice's total amounts where not updated because of direct lines deleting in database.
2020-11-30 11:22:49 +01:00
Laurent Destailleur
4f762cf73d Fix label 2020-11-30 08:29:19 +01:00
Stephane Lesage
0046bfc53f Fix Users list filter by gender 2020-11-29 23:42:47 +01:00
Laurent Destailleur
58eaef37d2 Fix regression 2020-11-29 21:29:22 +01:00
Laurent Destailleur
d45fe6c17f FIx #15551 2020-11-29 20:39:39 +01:00
Laurent Destailleur
d3a2aa664f FIX #15572 2020-11-29 20:27:40 +01:00
Laurent Destailleur
df17c2f26a Removed dead code generating warning.
CSS
2020-11-28 16:48:32 +01:00
Laurent Destailleur
c6b2ee57ca Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	.travis.yml
2020-11-27 16:19:44 +01:00
Laurent Destailleur
5ed2bbb204 Fix error message 2020-11-27 16:13:27 +01:00
Laurent Destailleur
4a5cdd0092 Several fixes in export and repair tool 2020-11-27 15:27:35 +01:00
Laurent Destailleur
ac3c129735 Clean code 2020-11-27 14:24:15 +01:00
Laurent Destailleur
26f07992a9 Reduce travis load for v11 2020-11-27 00:27:52 +01:00
Laurent Destailleur
6de24e0c2e Reduce travis load for v12 2020-11-27 00:19:45 +01:00
Laurent Destailleur
4da4499569 FIX Param joinfiles not sanitized
Conflicts:
	htdocs/admin/mails_templates.php
2020-11-26 23:07:52 +01:00
Laurent Destailleur
b043442b91 Fix link and selection of status of purchase order. 2020-11-26 17:53:57 +01:00
Laurent Destailleur
22c2cfd9ec FIX warning for purchase order delivery late. 2020-11-26 16:57:39 +01:00
Laurent Destailleur
dfa161ca30 Fix property 2020-11-26 16:19:45 +01:00
Laurent Destailleur
3ccc9d3e57 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-11-26 15:29:57 +01:00