lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
75,200 Commits 43 Branches 150 Tags 886 MiB
917b9d69fa
Commit Graph

2924 Commits

Author SHA1 Message Date
Jimmy L
a172ea00a4 Rest API: Proposal, Orders, Invoices: Add contact details 2019-02-12 17:54:59 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Philippe GRAND
71e99e0972 update with html5 compliant code 2019-02-04 10:42:40 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Philippe GRAND
540e6d6f79 update with html5 compliant code 2019-01-23 17:34:30 +01:00
Laurent Destailleur
844643c37d
Merge pull request #10375 from grandoc/new_branch_19_01_2019 
update with html5 compliant code
 2019-01-20 19:48:32 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Philippe GRAND
336be085f6 update with html5 compliant code 2019-01-19 12:28:18 +01:00
Laurent Destailleur
5130019003 css 2019-01-17 19:27:26 +01:00
Philippe GRAND
1a55d5fe85 update with html5 compliant code 2019-01-17 14:27:07 +01:00
ldestailleur
bc00fb177a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
ldestailleur
3af418349a FIX Can't empty the payment mode 2018-12-29 07:54:30 +01:00
Laurent Destailleur
b511a056f4 Fix phpcs 2018-12-15 11:48:21 +01:00
Laurent Destailleur
baf9b6f309 Fix regression (bad name of function) 2018-12-14 19:21:19 +01:00
Laurent Destailleur
38ddfd9a62
Merge pull request #10152 from defrance/patch-134 
refactoring list.php with dol_sql_datefilter
 2018-12-14 19:06:29 +01:00
Laurent Destailleur
3571eaee3d
Merge branch 'develop' into NEW_change_order_concat_desc 2018-12-14 17:44:08 +01:00
Laurent Destailleur
9fb672d51b
Merge pull request #10127 from atm-florian/develop_scrunitizer 
fix scrunitizer
 2018-12-14 17:28:34 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
83efdee7d3
Merge branch 'develop' into new_mass_generate 2018-12-14 15:44:46 +01:00
Laurent Destailleur
611ccc4a9a
Merge branch 'develop' into fieldlabel 2018-12-14 15:42:01 +01:00
Laurent Destailleur
233e160489
Merge pull request #9874 from atm-john/New_import_lines_from_linked_element_step2 
NEW Extend import option to Order's card and Propal's card
 2018-12-14 15:29:27 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber 2018-12-13 20:24:12 +01:00
Laurent Destailleur
138640fc63 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2018-12-04 14:58:11 +01:00
Laurent Destailleur
8e333c3feb Standardize code 2018-12-04 14:54:58 +01:00
Laurent Destailleur
d80baaea69 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2018-12-04 14:29:47 +01:00
Ferran Marcet
7247b14bd9 FIX Lines are not inserted correctly if VAT have code 2018-12-03 12:28:17 +01:00
Ferran Marcet
8312d57d16 FIX Lines are not inserted correctly if VAT have code 2018-12-03 11:58:39 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
BENKE Charlene
0d35f04cb7
Update list.php 2018-12-01 23:36:26 +01:00
florian HENRY
d928372239 fix https://scrutinizer-ci.com/g/Dolibarr/dolibarr/issues/develop/files/htdocs/commande/class/commande.class.php?selectedAuthors%5B0%5D=florian.henry%40atm-consulting.fr&orderField=path&order=asc&honorSelectedPaths=0 2018-12-01 14:51:22 +01:00
Laurent Destailleur
0367795488 Fix auto jump on record if only 1 record in a search 2018-11-27 11:09:47 +01:00
Thibault Descamps
c2e5a29246 NEW redirect if only one result on global search on card 2018-11-22 11:36:30 +01:00
Thibault Descamps
1cc130e5f6 NEW : conf to change concat desc order 2018-11-21 09:57:44 +01:00
JC Prieto
deff4ca4a0
Update list.php 
Missing the following lines to search total_ttc
 2018-11-19 20:03:36 +01:00
Laurent Destailleur
2f87ee6640 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-19 15:56:38 +01:00
Laurent Destailleur
f85ab8d0a6 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/card.php
 2018-11-19 15:55:41 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-15 22:01:36 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
gauthier
66ea8bbe87 FIX : fourn payment modes musn't be available on customer docs 2018-11-12 15:58:41 +01:00
Frédéric FRANCE
09efde4901
Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-09 18:13:59 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
3e844db74f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fichinter/stats/index.php
 2018-11-08 20:19:28 +01:00
John BOTELLA
98548337ae FIX supplier order list keep socid 2018-11-08 15:38:25 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Frédéric FRANCE
da3ee9ad9a
Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-10-30 19:04:35 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Laurent Destailleur
68f6ebd0ff Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/security.lib.php
	htdocs/modulebuilder/template/myobject_card.php
 2018-10-30 14:47:39 +01:00
Laurent Destailleur
afe61579e8 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-10-30 14:29:26 +01:00
Laurent Destailleur
b0ef8680ff Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-30 14:28:25 +01:00
Frédéric FRANCE
c92a2084f1
remove fieldlabel and add fieldeditkey 2018-10-27 14:50:27 +02:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
9c7ec434b7
remove fieldlabel and add fieldeditkey 2018-10-27 13:48:30 +02:00
Frédéric FRANCE
d67c40dffe
remove fieldlabel and add fieldeditkey 2018-10-27 13:01:01 +02:00
Frédéric FRANCE
f29ee25ea7
remove fieldlabel and add fieldeditkey 2018-10-27 11:06:45 +02:00
Frédéric FRANCE
a30091fd74
Update commande.class.php 2018-10-27 09:51:19 +02:00
Laurent Destailleur
852b069785 Fix reponsive in stats pages 2018-10-26 15:46:17 +02:00
atm-john
759b2b6ccf Extend import option to Order's card and Propal's card 2018-10-25 21:39:22 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
01adaf253c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/product/list.php
 2018-10-24 03:35:44 +02:00
Laurent Destailleur
c8aa884462 Fix search all 2018-10-23 17:16:46 +02:00
Laurent Destailleur
5f309bf155
Update commande.class.php 2018-10-19 13:38:23 +02:00
ptibogxiv
7c35eae202
Update commande.class.php 2018-10-17 00:06:24 +02:00
ptibogxiv
27b7cf8bea
Fix uniformization dates of order in API 2018-10-16 23:31:19 +02:00
Maxime Kohlhaas
d4d921b1cc Add massaction generate on main lists 2018-10-14 16:27:59 +02:00
Philippe GRAND
af0bcb2631 Standardize code 2018-10-09 09:40:00 +02:00
Laurent Destailleur
b3b2305651 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/pdf.lib.php
 2018-10-04 17:56:56 +02:00
Laurent Destailleur
13759ea146 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
 2018-10-04 17:53:40 +02:00
aplose
8ee7a48583 Fix issue #9434 : no array_options available when calling api : 
I replace the deprecated code by the fetch_optionnals() recommanded call.
 2018-10-03 15:15:46 +02:00
Laurent Destailleur
26d20d0b76
Merge pull request #8729 from atm-quentin/NEW_rights_ignoring_min_price 
NEW Advanced permission to ignore price min
 2018-09-27 09:57:49 +02:00
Laurent Destailleur
ab0f842db6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-16 12:55:44 +02:00
Laurent Destailleur
74a9c680df FIX "Other ..." link so the "Back to" link works. 2018-09-16 12:27:56 +02:00
Frédéric FRANCE
987fdbe73c
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Frédéric FRANCE
3e71f4e6b0
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 18:36:49 +02:00
Frédéric FRANCE
998b67fa98
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-12 18:32:15 +02:00
Laurent Destailleur
fcabe67e4b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 13:30:28 +02:00
Frédéric FRANCE
f02b2f0239
Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00
Frédéric FRANCE
a3fa13994b
replace select_date 2018-09-09 09:36:12 +02:00
Frédéric FRANCE
2b62c4ca8f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-08 10:50:27 +02:00
Laurent Destailleur
ff05997f0a FIX Several fixes on the management of minimal amount for orders 2018-09-06 17:37:02 +02:00
Philippe GRAND
3c06527a7b Merge remote-tracking branch 'upstream/develop' into new_branch_03_09_2018 2018-09-06 09:50:12 +02:00
Frédéric FRANCE
4cbfa2073a
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 21:02:16 +02:00
Laurent Destailleur
4ac67e6409 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-05 20:31:10 +02:00
Frédéric FRANCE
4e619dd0ed
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-05 18:51:21 +02:00
Laurent Destailleur
f1cb13634b FIX Entering negative price on order 2018-09-05 14:55:45 +02:00
Philippe GRAND
38ca6096b2 Standardize and update code 2018-09-05 10:31:12 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2018-09-04 21:35:43 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Frédéric FRANCE
bdcac95761
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 15:15:23 +02:00
Philippe GRAND
0492492df1 fix merge 2018-09-04 12:30:06 +02:00
Laurent Destailleur
3ef808cb9b Fix #9302 MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES broken 2018-09-04 11:23:28 +02:00