lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
76,942 Commits 43 Branches 150 Tags 886 MiB
116c6d7a6a
Commit Graph

4144 Commits

Author SHA1 Message Date
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Laurent Destailleur
17c3337c9b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-01-30 15:25:43 +01:00
Regis Houssin
39b696af02 FIX multicompany compatibility 2019-01-29 12:01:40 +01:00
Pierre Ardoin
f9b8622545
Prise en charge de Multicompany 
Correction pour éviter que les factures appartenant à d'autres entités n'apparaissent dans celle qui est consultée sur le moment.
 2019-01-29 11:33:22 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
John BOTELLA
9a666b265f Use an other test 2019-01-28 11:53:19 +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
Laurent Destailleur
d4daa6cebd
Merge pull request #10430 from frederic34/patch-18 
typo in fournisseur.product.class.php
 2019-01-27 17:51:49 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
0e3efadf59
typo in fournisseur.product.class.php 2019-01-27 14:37:37 +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
Laurent Destailleur
4a5d260db5
Update fournisseur.product.class.php 2019-01-26 14:07:37 +01:00
John BOTELLA
15e1d3b456 Fix fetch test 2019-01-24 09:40:58 +01:00
Francis Appels
1d08ccef07 Fix sql error 2019-01-22 16:39:54 +01:00
Francis Appels
7ad48064be Add code to show in fourn price tooltip. 2019-01-22 16:18:25 +01:00
Francis Appels
946c017937 Fix and clean price log. Key should price id iso product id. 2019-01-22 15:59:47 +01:00
Laurent Destailleur
d38ed67a3c
Merge pull request #10383 from grandoc/new_branch_21_01_2019 
update with html5 compliant code
 2019-01-21 18:05:40 +01:00
Laurent Destailleur
42743027d4
Merge branch 'develop' into objectline_etc 2019-01-21 18:04:48 +01:00
Philippe GRAND
cdacfc5f37 update with html5 compliant code 2019-01-21 09:54:59 +01:00
torvista
07b2bb6715 Swap of align/valign/border/width for css 
Removal of type="text/javascript"
 2019-01-20 23:36:39 +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
Philippe GRAND
549bbb06fc update with html5 compliant code 2019-01-19 12:50:06 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Laurent Destailleur
58bda12e22 css 2019-01-17 19:31:01 +01:00
Laurent Destailleur
5130019003 css 2019-01-17 19:27:26 +01:00
Laurent Destailleur
d5426730cb
Merge pull request #10318 from mapiolca/patch-6 
FIX Multicompany
 2019-01-10 14:01:19 +01:00
Laurent Destailleur
b4a6311f64 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-10 01:48:04 +01:00
Laurent Destailleur
057b606663 Fix tooltip 2019-01-09 15:03:44 +01:00
Laurent Destailleur
fbd490da15 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-09 13:29:47 +01:00
Laurent Destailleur
d1e062cafa FIX When changing date of payment, change also record in bank if not 
conciliated yet.
 2019-01-09 13:28:12 +01:00
Laurent Destailleur
d9999d61f6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-09 12:27:25 +01:00
Laurent Destailleur
890abd28d5 Fix look and feel v9 2019-01-09 12:26:49 +01:00
Laurent Destailleur
09fd3fce83 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-09 11:41:43 +01:00
Laurent Destailleur
61e9e8d60c Fix missing link 2019-01-09 11:41:23 +01:00
mapiolca
caace3730d
Prise en charge de Multicompany 
Evite que les factures appartenant à d'autres entités n'apparaissent dans celle qui est consultée sur le moment.
 2019-01-08 22:34:21 +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
3d30d8513f Fix phpcs 2018-12-16 20:36:22 +01:00
Laurent Destailleur
f55db6dd84 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/resources/dbmodel/dolibarr_schema.mwb
 2018-12-15 14:09:16 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
699dc239d4 Fix US trans 2018-12-15 12:24:14 +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
4b90f88793
Merge pull request #10158 from defrance/patch-135 
Refactoring list with dol_sql_datefilter function (end)
 2018-12-14 19:06:54 +01:00
Laurent Destailleur
3571eaee3d
Merge branch 'develop' into NEW_change_order_concat_desc 2018-12-14 17:44:08 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +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
5dabefe227 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-13 20:49:55 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber 2018-12-13 20:24:12 +01:00
Laurent Destailleur
6ad106d14a
Update fournisseur.facture.class.php 2018-12-13 19:56:22 +01:00
atm-quentin
3da9650003 FIX if qty is 0 2018-12-10 16:06:11 +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
135a94dfed Merge branch '7.0up' into 7.0 2018-12-03 11:59:46 +01:00
Ferran Marcet
8312d57d16 FIX Lines are not inserted correctly if VAT have code 2018-12-03 11:58:39 +01:00
Regis Houssin
8953a3ed73 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_mc

Conflicts:
	ChangeLog
 2018-12-03 08:46:03 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
BENKE Charlene
ad1ca07085
Update list.php 2018-12-02 09:58:18 +01:00
BENKE Charlene
1bc0defb31
Update list.php 2018-12-02 09:55:26 +01:00
Frédéric FRANCE
9692e98acf
Update fournisseur.facture.class.php 2018-12-01 22:49:12 +01:00
Laurent Destailleur
6d84036f66 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/index.php
	htdocs/contact/list.php
	htdocs/core/class/html.form.class.php
	htdocs/expensereport/card.php
	htdocs/install/doctemplates/shipment/template_shipment.odt
	htdocs/public/payment/newpayment.php
 2018-12-01 19:23:06 +01:00
Laurent Destailleur
cb9ada2119 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/modules/modSociete.class.php
	htdocs/product/price.php
 2018-12-01 18:19:45 +01:00
Maxime Kohlhaas
e8a02a971d Fix #9074 2018-11-30 23:05:12 +01:00
Laurent Destailleur
ef3a280f40
Merge pull request #10082 from grandoc/new_branch_26_11_2018 
fix typo error
 2018-11-29 10:57:48 +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
Philippe GRAND
05d617b759 fix typo error 2018-11-26 14:33:45 +01:00
Laurent Destailleur
2fcd221dbb
Merge pull request #10048 from frederic34/patch-15 
Update fournisseur.commande.class.php
 2018-11-24 11:20:21 +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
Laurent Destailleur
be4dc40dfa Fix standardize date format for payment between customer and supplier 2018-11-20 10:16:54 +01:00
Frédéric FRANCE
2e4ec1ed10
Update fournisseur.commande.class.php 2018-11-19 23:56:20 +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
Regis Houssin
aaa9a4f47c FIX use getEntity('invoice') instead getEntity('facture') 2018-11-15 17:27:49 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
gauthier
85dd0ec2dd FIX : filter on product category doesn't work 2018-11-13 15:24:53 +01:00
tarrsalah
5eb897e049 FIX sql query performance on list_qualified_avoir_supplier_invoices. 2018-11-12 12:11:40 +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
f1193ad3dd FIX: Missing date creation and modification of supplier price 2018-11-09 10:29:22 +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
2c3cd7a668 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modSyslog.class.php
 2018-10-30 15:32:09 +01:00
Laurent Destailleur
4dca94480e
Merge pull request #9892 from atm-maxime/fix_supp_inv_clone 
Fix invoice supplier clone was not getting all lines parameters #9800
 2018-10-30 14:59:48 +01:00
Laurent Destailleur
cb2a5baa45
Merge pull request #9919 from atm-john/Fix_clone_fourn_invoice 
Fix clone fourn order and invoice lines special code
 2018-10-30 14:55:50 +01:00
Laurent Destailleur
4a71374cf7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-30 14:48:09 +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
76c3bac777
Merge pull request #9900 from frederic34/patch-21 
use strict compare
 2018-10-30 14:23:14 +01:00
Laurent Destailleur
a16e7a84e9
Merge pull request #9899 from frederic34/patch-20 
use strict compare
 2018-10-30 14:23:01 +01:00
John BOTELLA
1e819ca7c1 FIX special code on create supplier invoice from supplier order 2018-10-30 10:46:33 +01:00
John BOTELLA
ca47d1b8b1 Fix clone fourn order and invoice lines special code 2018-10-30 10:26:59 +01:00
Laurent Destailleur
8fbf5b1f33 FIX deletion on draft is allowed if we are allwoed to create 2018-10-29 18:28:19 +01:00
Laurent Destailleur
0266db7aa8 FIX deletion on draft is allowed if we are allwoed to create 2018-10-29 18:19:40 +01:00
Laurent Destailleur
d02fccd7e4 Fix deletion of draft invoice 2018-10-29 14:56:00 +01:00
Laurent Destailleur
824757bca6 Fix perm to delete 2018-10-29 14:47:33 +01:00
Laurent Destailleur
27d82d0e8e FIX Delete of draft invoice 2018-10-29 14:41:00 +01:00
Frédéric FRANCE
d7507ac858
use strict compare 2018-10-27 21:00:59 +02:00
Frédéric FRANCE
84219039a2
use strict compare 2018-10-27 20:57:59 +02:00
Frédéric FRANCE
e1625990f2
use strict compare 2018-10-27 20:54:53 +02:00
Frédéric FRANCE
fe5056add8
remove fieldlabel and add fieldeditkey 2018-10-27 18:07:05 +02:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Maxime Kohlhaas
4ec80b5136 Fix invoice supplier clone was not getting all lines parameters #9800 2018-10-27 10:53:01 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
John BOTELLA
a380d3e89b Fix missing group by in query 2018-10-24 09:21:30 +02:00
atm-john
bed5084bcf Add missing Max payment date col 2018-10-23 21:44:45 +02:00
atm-quentin
04eb9ca167 fix dont change num version 2018-10-23 17:06:21 +02:00
atm-quentin
96d0bb8f2e FIX adapt develop 2018-10-23 14:31:58 +02:00
atm-quentin
8442b405b2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into PR_NEW_reception 2018-10-23 10:27:46 +02:00
atm-quentin
cfff4c7df8 NEW add ref supplier on supplier invoice 2018-10-22 14:32:50 +02:00
atm-quentin
eeb75bf650 FIX add object linked supplier order of reception 2018-10-18 10:26:32 +02:00
atm-quentin
dd0a57d39e FIX pdf for creating invoice without massaction 2018-10-17 15:36:47 +02:00
atm-quentin
236a61ab55 new manage correctly create bills on reception 2018-10-17 11:56:32 +02:00
atm-quentin
f11e1940fc NEW mass action list reception create bills for validated reception 2018-10-16 12:05:28 +02:00
atm-quentin
83c8a78628 NEW auto event msg 2018-10-15 17:08:28 +02:00
Maxime Kohlhaas
d4d921b1cc Add massaction generate on main lists 2018-10-14 16:27:59 +02:00
atm-quentin
3e29b11890 NEW add field list if reception 2018-10-11 17:30:14 +02:00
atm-quentin
aaace60b0d FIX stock movement on close reception and set status if too much receive$ 2018-10-10 15:33:35 +02:00
Philippe GRAND
9b6367c1ee Standardize and update code 2018-10-10 12:16:20 +02:00
atm-quentin
7ad4a7e384 NEW creation facture fourn depuis reception 2018-10-09 16:26:40 +02:00
Philippe GRAND
bba6669f03 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-09 08:47:26 +02:00
atm-quentin
c6ab79bad3 NEW note, contact and lines on card 2018-10-08 16:54:33 +02:00
Laurent Destailleur
59a082d251 FIX Show the date of invoice on supplier payment 2018-10-06 21:33:43 +02:00
atm-quentin
6a8092dfae NEW entete reception card 2018-10-05 16:21:50 +02:00
Philippe GRAND
073ec85208 Standardize code 2018-10-05 15:51:08 +02:00
Philippe GRAND
c7c3780400 clean code 2018-10-05 15:34:32 +02:00
atm-quentin
752c35d6d1 addline presque fini 2018-10-04 17:32:50 +02:00
Laurent Destailleur
ba3552558c
Merge pull request #9662 from frederic34/patch-17 
remove useless param
 2018-10-04 17:26:21 +02:00
Laurent Destailleur
9f2a2be837
Merge pull request #9661 from frederic34/patch-16 
remove useless phpcs:disable
 2018-10-04 17:25:44 +02:00
atm-quentin
5fe767d7bd debut card create 2018-10-04 12:27:10 +02:00
atm-quentin
bc07936d42 NEW list on dispatch 2018-10-04 10:17:18 +02:00
atm-quentin
52717dbb65 NEW debut rename stock conf 2018-10-03 18:05:22 +02:00
Frédéric FRANCE
1735229f15
remove useless param 
/**
     *  Return label of a status
     *
     * 	@param  int $statut		Id statut
     *  @param  int $mode       0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto
     *  @param  int $billed     1=Billed
     *  @return string				Label of status
     */
    function LibStatut($statut,$mode=0,$billed=0)
    {
 2018-10-02 20:47:40 +02:00
Frédéric FRANCE
dae2757b73
remove useless phpcs:disable 2018-10-02 20:39:44 +02:00
Alexey Pyltsyn
49de7a5881 Replace multiple load calls with loadLangs method 2018-10-01 09:22:23 +03:00
Philippe GRAND
574cfad48f Standardize and update code 2018-09-28 14:49:34 +02:00
Laurent Destailleur
d72446cebc
Merge pull request #9528 from grandoc/new_branch_16_09_2018 
New branch 16 09 2018
 2018-09-18 15:01:23 +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
Philippe GRAND
9f35767b4b Standardize and update code 2018-09-16 11:53:49 +02:00
Philippe GRAND
251273e3c3 Standardize and update code 2018-09-16 11:50:29 +02:00
Philippe GRAND
cd8e0aa919 Standardize and update code 2018-09-16 11:47:56 +02:00
Philippe GRAND
120f823065 Standardize and update code 2018-09-16 11:45:18 +02:00
Philippe GRAND
988774120c Standardize and update code 2018-09-16 11:42:20 +02:00
Philippe GRAND
ab92871dc3 Standardize and update code 2018-09-16 11:37:43 +02:00
Laurent Destailleur
d6ee00f2e7 Fix constructors does not need return value 2018-09-16 10:22:23 +02:00
Frédéric FRANCE
fafa7f18b1
reduce complexity libstatut fournisseur.commande;class.php 2018-09-15 22:24:57 +02:00
gauthier
7838b75ec9 FIX : wrong var name 2018-09-13 16:11:42 +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
8249756726
replace select_date 2018-09-09 10:40:00 +02:00
Frédéric FRANCE
b2a58067d9
replace select_date 2018-09-09 09:56:33 +02:00
Laurent Destailleur
bcfb5fc42e
Merge pull request #9425 from atm-maxime/8.0 
FIX : Homepage links were using wrong topmenus
 2018-09-07 19:35:10 +02:00
Laurent Destailleur
ff05997f0a FIX Several fixes on the management of minimal amount for orders 2018-09-06 17:37:02 +02:00
Maxime Kohlhaas
a5f4a74ecc FIX : Homepage links were using wrong topmenus 2018-09-06 14:49:48 +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
fd6281b364
move phpcs:ignore 2018-09-04 20:00:09 +02:00
Frédéric FRANCE
5f4a922c1d
move phpcs:ignore 2018-09-03 19:00:37 +02:00
Frédéric FRANCE
2a9ef8dc05
move phpcs:ignore 2018-09-02 22:05:19 +02:00
Frédéric FRANCE
35232b753a
move phpcs:ignore 2018-09-02 20:37:12 +02:00
Philippe GRAND
3de16a145e Standardize and update code 2018-09-02 11:08:41 +02:00
Philippe GRAND
db32d8903e Standardize and Update code 2018-09-01 23:20:20 +02:00
Philippe GRAND
7b0d3c32ab Standardize and Update code 2018-09-01 22:55:10 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps 
mark non camelCaps function
 2018-09-01 15:37:56 +02:00
Philippe GRAND
45cbc36a15 Standardize and update code 2018-09-01 15:27:55 +02:00
Philippe GRAND
17e349eba2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 14:27:53 +02:00
Laurent Destailleur
bcee0ef0ae Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/societe/class/societe.class.php
	htdocs/stripe/config.php
 2018-09-01 14:16:57 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Laurent Destailleur
482ddd548a
Merge pull request #9332 from frederic34/functionClosingBrace 
PSR2 FunctionClosingBrace
 2018-09-01 12:06:08 +02:00
Philippe GRAND
bb05e80a87 Standardize and update code 2018-08-31 18:47:25 +02:00
Philippe GRAND
9e880d3e72 Standardize and update code 2018-08-31 17:55:31 +02:00
Laurent Destailleur
9cc6533d11 Fix td alignement 2018-08-30 18:57:30 +02:00
Frédéric FRANCE
5100b8b7b0
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-30 10:42:47 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Laurent Destailleur
7211aff016
Update dispatch.php 2018-08-29 21:11:28 +02:00
Laurent Destailleur
a8bb55c66d
Merge branch '8.0' into 7.0_new_dispatch 2018-08-29 21:08:51 +02:00
Laurent Destailleur
88044a3d75
Update dispatch.php 2018-08-29 20:42:19 +02:00
Laurent Destailleur
489e766cbf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/ticket/class/ticket.class.php
 2018-08-29 20:24:01 +02:00
Laurent Destailleur
3ebfb23407 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/fournisseurs.php
	htdocs/ticket/class/ticket.class.php
 2018-08-29 20:22:50 +02:00
Frédéric FRANCE
cbdc669ba9
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-29 18:45:36 +02:00
Laurent Destailleur
86d8513138
Merge pull request #9309 from frederic34/trimtrailing2 
last trimtrailing
 2018-08-29 17:57:05 +02:00
Laurent Destailleur
7bf48b8d77 Fix date_start and date_end not saved on supplier invoice 
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2018-08-29 17:26:41 +02:00
Laurent Destailleur
98356c6ed0 Fix date_start and date_end not saved on supplier invoice 2018-08-29 17:03:18 +02:00
Frédéric FRANCE
0e512cbc36
Merge remote-tracking branch 'upstream/develop' into trimtrailing2 2018-08-29 15:47:55 +02:00
Laurent Destailleur
ee204e2e64 Fix regression in php style 2018-08-29 15:37:35 +02:00
atm-quentin
76cb9f60c7 NEW hook on dispatch order fourn 2018-08-29 14:26:04 +02:00
Laurent Destailleur
b5c2383f65 Fix type of invoice encoded twice 2018-08-28 18:34:53 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Frédéric FRANCE
1182f29864
trimtrailing 2018-08-28 08:33:02 +02:00
Laurent Destailleur
50d50c2e10
Merge pull request #9307 from ATM-Marc/FIX_6.0_thirdparty_info 
NEW On customer/supplier card, add simple tooltip to amount boxes
 2018-08-28 02:48:05 +02:00
Laurent Destailleur
9a14611d55
Merge pull request #8996 from grandoc/new_branch_20_06_2018 
clean and update code
 2018-08-28 02:35:59 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing 
Trimtrailing
 2018-08-28 02:30:02 +02:00
Marc de Lima Lucio
d09f9b2543 FIX: customer/supplier card: add simple tooltip to amount boxes 2018-08-27 18:19:42 +02:00
Philippe GRAND
87067b2bc9 Standardize and update code 2018-08-23 18:35:45 +02:00
Philippe GRAND
74ce0bfea6 Standardize and update code 2018-08-23 16:54:24 +02:00
Philippe GRAND
80b7229174 Standardize and update code 2018-08-23 11:34:55 +02:00
Philippe GRAND
9e900e583d Merge branch 'new_branch_21_08_2018' of github.com:grandoc/dolibarr into new_branch_21_08_2018 2018-08-23 11:13:54 +02:00
Philippe GRAND
aafa16afa5 Update and standardize code 2018-08-23 11:11:46 +02:00
Philippe Grand
f98d2078e2
Merge branch 'develop' into new_branch_20_06_2018 2018-08-23 10:41:34 +02:00
Philippe Grand
b817517997
Update fournisseur.product.class.php 2018-08-23 10:08:17 +02:00
Philippe Grand
0e3c9ffd51
Update fournisseur.facture.class.php 2018-08-23 10:05:02 +02:00
Philippe GRAND
0c75c41e7b Update and standardize code 2018-08-22 19:56:24 +02:00
Philippe GRAND
06da7f54a2 Update and standardize code 2018-08-22 18:48:53 +02:00
Philippe GRAND
0ffad50974 Update and standardize code 2018-08-22 11:24:31 +02:00
Philippe GRAND
a36061079b Update and standardize code 2018-08-22 11:11:59 +02:00
Philippe GRAND
a669830427 Update and standardize code 2018-08-22 10:37:16 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 14:03:02 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-16 08:17:55 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration 2018-08-16 00:52:55 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing 2018-08-16 00:47:09 +02:00
Frédéric FRANCE
69a7af88e7
function declaration 2018-08-15 18:14:02 +02:00
Laurent Destailleur
ec56ad752c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-15 14:26:38 +02:00
Frédéric FRANCE
c0478cb42f
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-14 15:54:40 +02:00
Frédéric FRANCE
d30874750f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-14 09:02:12 +02:00
Laurent Destailleur
b98ee516d0
Merge pull request #9235 from grandoc/new_branch_13_08_2018 
standardize code
 2018-08-13 23:47:00 +02:00
Laurent Destailleur
b4a4ab4fa0
Merge pull request #9233 from grandoc/new_branch_12_08_2018 
standardize code
 2018-08-13 23:46:37 +02:00
delcroix Patrick
3b9266060c Fix #9205 quote in Label/number on supplier payment 
# Fix #9205 #9205
the num_paiement wasn't escaped, not sure it's an real issue but it was reported here
https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408
 2018-08-13 23:42:18 +02:00
delcroix Patrick
cbdd1949df
Fix #9205 quote in Label/number on supplier payment 
# Fix #9205 #9205
the num_paiement wasn't escaped, not sure it's an real issue but it was reported here
https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408
 2018-08-13 20:39:20 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Laurent Destailleur
b977c3a9f5 Fix translation 2018-08-13 14:04:10 +02:00
Philippe GRAND
f1f64db4dc standardize code 2018-08-13 10:20:21 +02:00
Philippe GRAND
dc3a2ac26e standardize code 2018-08-12 22:40:47 +02:00
Frédéric FRANCE
82e8efe792
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 20:14:14 +02:00
Laurent Destailleur
9fc5d39d07 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:36 +02:00
Laurent Destailleur
dc8c4402ee Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-12 20:09:22 +02:00
Laurent Destailleur
0a1c6e7194 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/compta/facture/list.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-08-12 20:08:20 +02:00
Frédéric FRANCE
62db9a4022
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 19:54:03 +02:00
Laurent Destailleur
2d571acc03 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/list.php
 2018-08-12 19:25:44 +02:00
Laurent Destailleur
30b4d88428 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/product/reassort.php
	htdocs/societe/list.php
 2018-08-12 19:23:45 +02:00
Laurent Destailleur
1b20d6feab
Merge pull request #9214 from atm-greg/Add_supplier_product_description 
NEW Can record the supplier product description
 2018-08-12 18:56:27 +02:00
Frédéric FRANCE
6f74ecceaf
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 18:21:59 +02:00
Frédéric FRANCE
79aaddbb66
test phpcs v3 2018-08-09 14:46:00 +02:00