Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
78,966 Commits 36 Branches 189 Tags
c8ab03432b1df37e93a09a8febdfc9e27ba70d9c
Commit Graph

1377 Commits

Author SHA1 Message Date
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
 2019-09-27 14:11:14 +02:00
Laurent Destailleur
aa5f35f14f Fix image on ticket 2019-09-26 14:28:34 +02:00
altairis
c59e26457d add MAIN_SHOW_COMPANY_NAME_IN_BANNER_ADDRESS constant 2019-09-25 12:18:19 +02:00
Laurent Destailleur
0194f48041 Merge pull request #10795 from altatof/clonecat 
NEW : copy linked categories on product clone process
 2019-09-15 16:34:42 +02:00
Laurent Destailleur
6bfba0b731 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
 2019-09-15 15:17:38 +02:00
TuxGasy
e0238705cc Check if childtablesoncascade is not empty 2019-09-14 19:04:43 +02:00
Laurent Destailleur
aad6b003fb Add cache in fetch_optionnals() to avoid duplicate call to 
fetch_name_optionals_label
 2019-09-14 00:02:48 +02:00
Laurent Destailleur
7fe2483a82 Merge branch 'develop' into Hook_on_commonGenerateDocument 2019-09-07 10:26:23 +02:00
Laurent Destailleur
165f64463b Fix look and feel v10 2019-09-06 12:46:54 +02:00
Laurent Destailleur
123eace8c0 Fix look and feel v10 2019-09-06 12:44:23 +02:00
stickler-ci
cd96238adc Fixing style errors. 2019-09-05 14:19:35 +00:00
Christophe Battarel
6902b2cbf2 fix function visibility thanks to stckler 2019-09-05 16:14:15 +02:00
Christophe Battarel
1cfd5615d3 resolv conflict 2019-09-05 16:10:23 +02:00
Maxime Kohlhaas
9c09876bd4 Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_choose_lines_from_origin 2019-08-27 14:33:34 +02:00
Maxime Kohlhaas
4bd806ea65 Move $selectedlines to parameter 2019-08-27 14:33:28 +02:00
Laurent Destailleur
9f18b3d690 Update commonobject.class.php 2019-08-15 19:53:38 +02:00
ptibogxiv
a489207122 Fix force recalculate price with multicurrency 2019-08-12 13:56:12 +02:00
Laurent Destailleur
d663657f15 FIX format of field with type timestamp 2019-08-04 13:06:48 +02:00
Laurent Destailleur
31648f856c FIX format of field with type timestamp 2019-08-04 13:04:37 +02:00
Laurent Destailleur
5b2ca3b631 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-08-03 16:37:25 +02:00
Laurent Destailleur
25ee539f92 FIX Missing where on entity 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-08-03 16:35:15 +02:00
Laurent Destailleur
acf8314935 FIX Missing where on entity 2019-08-03 16:32:35 +02:00
Laurent Destailleur
3d8f6dca76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:32 +02:00
Laurent Destailleur
6512435f9f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/cheque/doc/pdf_blochet.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2019-08-01 16:27:55 +02:00
Laurent Destailleur
a7390e7e47 Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop 
NEW Management of retained warranty on situation invoices
 2019-07-30 21:53:09 +02:00
Laurent Destailleur
ed7a57e3ef Merge pull request #11571 from atm-john/9.0_fix_showOutputField 
Fix sellist showOuputField
 2019-07-30 21:40:37 +02:00
ATM john
581ae226ff Fix sellist showOuputField 2019-07-27 18:25:25 +02:00
Maxime Kohlhaas
5c2763d0dd Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_choose_lines_from_origin 2019-07-27 10:53:43 +02:00
Laurent Destailleur
9f7d118f6f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-27 02:40:56 +02:00
Laurent Destailleur
1ca3c6e3ae Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-26 13:17:47 +02:00
Regis Houssin
6409cc06ae FIX duplicate on the check (TODO field $onetrtd not used ?) 2019-07-22 11:44:56 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
3cffd70ed3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/prelevement/create.php
	htdocs/core/class/commonobject.class.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/fourn/product/list.php
	htdocs/opensurvey/index.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
 2019-07-18 18:09:37 +02:00
Laurent Destailleur
b044d95acf Merge 2019-07-18 17:50:15 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Laurent Destailleur
e0095871aa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/stats/byratecountry.php
	htdocs/core/class/html.form.class.php
 2019-07-14 00:19:56 +02:00
Laurent Destailleur
3bfc1938d3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2019-07-14 00:13:16 +02:00
Laurent Destailleur
4dabdfa5ac Merge pull request #11483 from inoveaconseil/FIX_update_price 
FIX element name in update_price
 2019-07-13 23:30:17 +03:00
Laurent Destailleur
f041110a7e Update commonobject.class.php 2019-07-13 22:29:50 +02:00
Nicolas ZABOURI
abd0abf115 FIX element name in update_price 2019-07-10 18:36:12 +02:00
Laurent Destailleur
e5d34de877 FIX compatibility mysql 8. rank is reserved 
FIX Permission for BOM menu
 2019-07-09 00:14:01 +02:00
Maxime Kohlhaas
9c47cb6f91 NEW : can choose lines while creating order from origin 2019-07-08 23:16:32 +02:00
Frans Bosman
cd7d4de6ec Update commonobject.class.php 2019-07-03 16:53:26 +02:00
Frans Bosman
116c6d7a6a Update commonobject.class.php 2019-07-03 11:09:24 +02:00
Frans Bosman
9064737930 Update commonobject.class.php 2019-07-03 07:08:53 +02:00
Frans Bosman
221c202add Update commonobject.class.php 2019-07-03 06:59:52 +02:00
fbosman
3e91fdda77 Update commonobject.class.php 2019-07-01 12:34:27 +02:00
John Botella
7e14a598e2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-26 09:43:43 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
2a3b4c3fd7 Merge pull request #11111 from OPEN-DSI/new-extrafields-separator-collapse 
NEW add extrafield separator collapsing capabilities
 2019-06-24 19:04:51 +02:00