lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
92,401 Commits 43 Branches 150 Tags 886 MiB
8697fda78b
Commit Graph

92401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zebedeu
8697fda78b fix | fixed the error of installation start of version 13.0.0-beta 
this patch fixed the problem but nevertheless does not pass the test because at the time of installation the variable $conf->theme is null
 2020-12-06 07:22:06 +01:00
Zebedeu
f708065445 Revert "Fix | fixed the error of installation start of version 13.0.0-beta" 
This reverts commit 1a1850c6f1.
 2020-12-06 07:14:11 +01:00
Zebedeu
1a1850c6f1 Fix | fixed the error of installation start of version 13.0.0-beta 2020-12-05 20:28:55 +01:00
Zebedeu
1917d9b508 Revert "Fix #15675 fixed the error of installation start of version 13.0.0-beta" 
This reverts commit 7a8d031d56.
 2020-12-05 20:23:31 +01:00
Zebedeu
7a8d031d56 Fix #15675 fixed the error of installation start of version 13.0.0-beta 2020-12-05 20:17:57 +01:00
Zebedeu
e126f9ce5d Revert "Fix/FIX html tag formatting errors in the accounting area" 
This reverts commit 0c05662010.
 2020-12-05 16:41:36 +01:00
Zebedeu
8ce586b624 Merge branch 'develop' of https://github.com/Zebedeu/dolibarr into develop 2020-12-05 16:33:41 +01:00
Zebedeu
0c05662010 Fix/FIX html tag formatting errors in the accounting area 2020-12-05 16:31:44 +01:00
stickler-ci
1c221302cd Fixing style errors. 2020-12-05 11:09:16 +00:00
Zebedeu
f035bd774d New | personal and professional titles added for employee users in vcard 
personal and professional titles added for employee users in vcard
 2020-12-05 11:59:30 +01:00
Zebedeu
6d2159e8f0 New #8472 personal and professional titles added 
personal and professional titles added for employee users
 2020-12-05 11:30:18 +01:00
Laurent Destailleur
0536ed87a2 Avoid to process too large user agent 2020-12-04 21:38:33 +01:00
Laurent Destailleur
05a560c2e3 Fix warning 2020-12-04 20:43:11 +01:00
Laurent Destailleur
c1eb7e5dbb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-04 20:07:16 +01:00
Laurent Destailleur
2b267cf8e4 Fix warnings 2020-12-04 20:06:55 +01:00
Laurent Destailleur
aa853f9259 Debug v13 2020-12-04 20:02:04 +01:00
Laurent Destailleur
67425abd29
Merge pull request #15602 from c3do/patch-18 
API orders: Update demand reason on order update
 2020-12-04 19:43:43 +01:00
Laurent Destailleur
4ba31ae52e Debug missing column packaging 2020-12-04 19:40:56 +01:00
Laurent Destailleur
10bef6eb03 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/opensurvey/class/opensurveysondage.class.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/card.php
 2020-12-04 19:24:29 +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
9cbdbc460d Fix multicurrency 2020-12-04 19:10:43 +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
6c8a6aa81f
Merge pull request #15641 from denis-poncereau/develop 
Corrected "cash fence" to "cash desk closing" on english .lang files
 2020-12-04 16:00:57 +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
Laurent Destailleur
f0dec80dae css 2020-12-04 15:39:30 +01:00
atm-benoit
b9461322d9 FIX SUPPLIER PROPOSAL v12 bug add 2020-12-04 15:37:00 +01:00
Laurent Destailleur
2e5ac9b40a CSS 2020-12-04 15:36:14 +01:00
Laurent Destailleur
e7306625f0 Fix look and feel v13 2020-12-04 15:28:12 +01:00
Laurent Destailleur
6d4a90b543 Clean code 2020-12-04 14:53:52 +01:00
atm-benoit
575bb7d420 FIX SHIP MODE install v12 bug insert 2020-12-04 14:20:25 +01:00
Laurent Destailleur
c8f918265a Removed dead code 2020-12-04 13:25:56 +01:00
Laurent Destailleur
34679c3bc1 Fix warning in phpunit 2020-12-04 13:22:47 +01:00
Laurent Destailleur
0d4121c5bd Fix warning 2020-12-04 12:01:41 +01:00
Francis Appels
5218550014 Merge remote-tracking branch 'Dolibarr/11.0' into 11 2020-12-04 11:08:21 +01:00
Denis
2173b8566e Corrected "cash fence" to "cash desk closing" on english .lang files 2020-12-04 10:58:29 +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