Commit Graph

1596 Commits

Author SHA1 Message Date
Laurent Destailleur
27f8096afa Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +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
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
BENKE Charlene
ad1ca07085 Update list.php 2018-12-02 09:58:18 +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
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
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
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
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +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
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
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
John BOTELLA
1e819ca7c1 FIX special code on create supplier invoice from supplier order 2018-10-30 10:46:33 +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
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
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
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
Maxime Kohlhaas
d4d921b1cc Add massaction generate on main lists 2018-10-14 16:27:59 +02:00
atm-quentin
7ad4a7e384 NEW creation facture fourn depuis reception 2018-10-09 16:26:40 +02:00
Laurent Destailleur
59a082d251 FIX Show the date of invoice on supplier payment 2018-10-06 21:33:43 +02:00
Alexey Pyltsyn
49de7a5881 Replace multiple load calls with loadLangs method 2018-10-01 09:22:23 +03: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
b2a58067d9 replace select_date 2018-09-09 09:56:33 +02:00