lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
87,924 Commits 43 Branches 150 Tags 886 MiB
7a93c11ae0
Commit Graph

87924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian HENRY
7a93c11ae0 FIX : dupliacete customer or supplier code must be error dipslayed with new code proposed 2020-12-15 22:01:33 +01:00
Laurent Destailleur
d1c66059cd Add missing tag order_ref and order_ref_customer on shipments for ODT 
generation.

Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2020-12-06 19:03:46 +01:00
Laurent Destailleur
3770eef8dc Fix can import all categories 2020-12-04 19:51:14 +01:00
Laurent Destailleur
c1b6e58bbd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-12-04 19:12:22 +01:00
Laurent Destailleur
49db52134b Fix for negative numbers 2020-12-04 18:19:51 +01:00
Laurent Destailleur
e0b737b622
Merge pull request #15650 from atm-lena/12.0_FIX_PriceToNum_ConvertNegativToPositiv 
pricetonum() - preg-replace() delete "-" negativ number
 2020-12-04 18:19:22 +01:00
Laurent Destailleur
c69821794e
Merge pull request #15651 from fappels/11_fix_volume_calculation 
FIX product auto volume calculation
 2020-12-04 18:17:38 +01:00
Laurent Destailleur
aeda250df4 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/install/mysql/data/llx_c_shipment_mode.sql
 2020-12-04 18:14:57 +01:00
Laurent Destailleur
283d4742f4 Merge branch 'FHenry-12.0_fix_fourn_commande_round' into 12.0 2020-12-04 18:13:29 +01:00
Laurent Destailleur
bc7cb4a148
Merge pull request #15640 from ATM-Consulting/FIX/12.0_Opensurvey_filters_by_entity_but_always_sets_entity_to_1 
FIX 12.0 - on survey creation, entity is always set to 1 ⇒ set it to $conf->entity
 2020-12-04 18:11:24 +01:00
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
Francis Appels
223205cf9d Fix volume calcution, depends on surface not surface_units 
surface_unit can be 0 for m2
 2020-12-04 16:54:40 +01:00
atm-lena
d22646e6ae pricetonum() - preg-replace() delete "-" negativ number 2020-12-04 16:06:10 +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
Francis Appels
5218550014 Merge remote-tracking branch 'Dolibarr/11.0' into 11 2020-12-04 11:08:21 +01:00
Florian Mortgat
7685ed8295 FIX excess comma 2020-12-04 10:10:44 +01:00
Florian HENRY
94d57cd462 fix rounding 2020-12-04 10:03:06 +01:00
Florian Mortgat
c752bfe1a6 FIX 12.0 - set entity to $conf->entity (instead of 1 by default) when creating a survey; otherwise the survey cannot be listed from the entity it was created on unless it is the main entity 2020-12-04 10:02:39 +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
Florian HENRY
7a5a6a14f0 fix At install insert shipment mode failed 2020-12-04 09:10:36 +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
Francis Appels
5ec351911d Merge remote-tracking branch 'Dolibarr/11.0' into 11 2020-12-01 16:04:11 +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