lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
109,623 Commits 43 Branches 150 Tags 886 MiB
develop
Commit Graph

2005 Commits

Author SHA1 Message Date
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Frédéric FRANCE
f3154566a4
Update index.php 2019-11-05 19:03:28 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
6e591d2be0 Fix css 2019-11-04 18:25:32 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Laurent Destailleur
666e60a883 Responsive 2019-11-04 11:40:54 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
f9031cdbfd Clean code 2019-11-02 11:36:48 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Laurent Destailleur
135e65c4aa Look and feel v11 
Enhance the progress bar of tasks
 2019-11-01 15:53:57 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
20f97807ce
clean indent 2019-10-27 10:07:47 +01:00
Frédéric FRANCE
635306c084
restore original rules to be mergeable without errors 2019-10-26 18:23:51 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
e07e01580d Replace deprecated code with new one 2019-10-16 03:34:32 +02:00
Laurent Destailleur
5056d7220b Fix multicurrency not yet supported on contracts 2019-10-14 15:36:28 +02:00
Frédéric FRANCE
ae62d3d60a
Update list.php 2019-10-08 18:43:22 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Frédéric FRANCE
0b9213f4f1
Update contrat.class.php 2019-10-07 08:11:23 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
fec67aade4
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 18:44:34 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon 
NEW Add fa_icon on load_fiche_titre
 2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Frédéric FRANCE
258424416e
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 07:49:52 +02:00
Laurent Destailleur
6966651d51 Standardize code to use dolSqlDateFilter 2019-09-28 13:22:05 +02:00
Laurent Destailleur
86e5465197 Standardize extrafields code 2019-09-28 10:55:09 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Frédéric FRANCE
61e358bb9d
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-18 21:23:26 +02:00
Laurent Destailleur
2286cc2a5f Fix autojump when 1 record found 2019-09-18 20:16:39 +02:00
Frédéric FRANCE
c9c7d60fc0
Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-14 16:37:10 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Frédéric FRANCE
bd4c9a64a8
wip 2019-09-07 14:48:25 +02:00
Laurent Destailleur
f12a012932
Update card.php 2019-09-06 23:25:40 +02:00
Regis Houssin
369961b376 FIX avoid Warning: A non-numeric value encountered 2019-09-06 11:55:41 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
4a19f510fd Fix scrutinizer reports 2019-09-05 13:58:35 +02:00
Laurent Destailleur
98459363df
Merge pull request #11795 from jtraulle/fix-doxygen-examples 
Fix Wrongly catched examples by Doxygen
 2019-09-03 12:45:23 +02:00
Laurent Destailleur
a269082d70 Replace deprecated code with new one 2019-09-02 03:58:00 +02:00
Jean Traullé
c32c7d48ba
Fix Wrongly catched examples by Doxygen 2019-08-30 17:14:59 +02:00
Laurent Destailleur
a5c43b42c3 Add a protection when we have several records 2019-08-23 13:28:26 +02:00
VESSILLER
ae87b33e81 NEW add entity in fetch method for contract 2019-08-20 17:04:41 +02:00
John Botella
b4c4e5a662 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard 2019-08-02 14:52:01 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
John Botella
9b84987cc1 prepare new dashboard 2019-08-01 12:33:19 +02:00
Laurent Destailleur
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +02:00
Laurent Destailleur
11e3aa5860 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 11:07:11 +02:00
Laurent Destailleur
7931f0b422 Fix sql error 2019-07-29 11:06:39 +02:00
Laurent Destailleur
a5e3adc6f1 Fix travis 2019-07-29 10:51:17 +02:00
Laurent Destailleur
db461792a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 01:36:35 +02:00
Laurent Destailleur
9a7113f4f5 FIX Update the file index table when we validate/rename a ref. 2019-07-28 22:26:55 +02:00
Laurent Destailleur
a61a435095 Fix tab title 2019-07-23 02:54:49 +02:00
Laurent Destailleur
bf55733678 NEW Replace the "info" tab on contract with the more complete "agenda" 
tag.
 2019-07-23 02:45:31 +02:00
Alexandre SPANGARO
5f042cf6ad QUAL Move ligne.php to line.php 2019-07-19 23:19:06 +02:00
Laurent Destailleur
f5cc29417d Translation lignes -> lines 2019-07-05 21:50:35 +02:00
Laurent Destailleur
7de92070d7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
 2019-06-29 16:46:16 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
c0ba22fc6c
Merge pull request #11406 from ptibogxiv/patch-194 
NEW Can load multilang translation in same step than fetch_lines
 2019-06-28 14:04:06 +02:00
ptibogxiv
30dd3a76d2
Update contrat.class.php 2019-06-26 08:23:06 +02:00
Laurent Destailleur
68bc096ef3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-25 23:41:56 +02:00
Laurent Destailleur
a68d9fc5e6 Fix css 2019-06-25 23:31:29 +02:00
ptibogxiv
c813c33e42
Update contrat.class.php 2019-06-25 18:13:53 +02:00
ptibogxiv
87d4e4e356
Update contrat.class.php 2019-06-25 15:49:47 +02:00
ptibogxiv
a9adccabc3
Update contrat.class.php 2019-06-25 15:48:41 +02:00
Laurent Destailleur
43d65e8073 Add hook 2019-06-24 22:59:00 +02:00
Laurent Destailleur
83ec64d473 Add hook getnomurltooltip on contract 2019-06-24 22:52:27 +02:00
ICstage
820c420ae5 FIX Missing hooks 2019-06-18 14:07:52 +02:00
Francis Appels
1688bc3f7e Merge branch '10' into clean_10_beta 2019-06-12 14:38:25 +02:00
Laurent Destailleur
a143dba9f8 Work on incomplete code on BOM module 2019-06-03 20:46:11 +02:00
Francis Appels
e496967235 Fix scrutinizer, wrong unitprice var 2019-05-30 17:30:53 +02:00
Laurent Destailleur
cf70b26db7 Add distinct id 2019-05-29 10:27:03 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Laurent Destailleur
eafc35b00f Look and feel v10 2019-05-21 13:27:45 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button 
NEW : look and feel title button
 2019-05-18 16:04:47 +02:00
Laurent Destailleur
c1ec7454a1
Merge branch 'develop' into clean_10_beta 2019-05-16 21:21:51 +02:00
Laurent Destailleur
ac1bab1711 Fix sanitize params 2019-05-16 12:28:57 +02:00
Francis Appels
79a347ab11 Fix PHPCS contract list 2019-05-13 22:49:43 +02:00
Laurent Destailleur
75646e365d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/contrat/services_list.php
	htdocs/expensereport/list.php
	htdocs/product/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/projet/list.php
 2019-05-13 12:28:16 +02:00
Laurent Destailleur
9242c1a630 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	ChangeLog
	htdocs/contrat/services_list.php
	htdocs/core/lib/files.lib.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
 2019-05-13 12:22:14 +02:00
Juanjo Menent
f4ca6916cd Merge remote-tracking branch 'upstream/7.0' into 8.0 
# Conflicts:
#	htdocs/contrat/services_list.php
#	htdocs/expensereport/list.php
#	htdocs/projet/list.php
 2019-05-11 17:31:23 +02:00
Juanjo Menent
3ae2d71ea6 Fix: missing GETPOST params 2019-05-11 17:00:55 +02:00
Juanjo Menent
91ae365588 Fix: missing GETPOST params 2019-05-11 16:58:00 +02:00
Laurent Destailleur
3def11d5c9 Standardize translation 2019-05-10 19:32:46 +02:00
Laurent Destailleur
648b2506ab FIX visible ref on contract link for old contract without ref 2019-05-04 11:45:31 +02:00
Laurent Destailleur
8442c86436 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/index.php
 2019-05-02 17:40:41 +02:00
Laurent Destailleur
4e94d92b70 Fix link 2019-05-02 17:24:05 +02:00
Laurent Destailleur
9b21c827c3 Fix remove var_dump 2019-05-02 17:17:52 +02:00
Laurent Destailleur
4899d03ff8 FIX Confusion between expired and late 2019-05-02 17:15:24 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
Laurent Destailleur
e6ffaeefe5 CSS 2019-04-17 10:39:30 +02:00
ATM john
07e6ce5460 Appli function to links 2019-04-15 21:33:31 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
7b01e76d2b Fix doxygen 2019-04-08 16:04:15 +02:00
Laurent Destailleur
8a6e28860b A better transition with deprecation 2019-04-01 22:09:24 +02:00
Laurent Destailleur
2b41d0c59d
Merge pull request #10938 from inoveaconseil/HookPrintFieldLIstFooter 
FIX missing hook
 2019-03-31 18:44:07 +02:00
Laurent Destailleur
1b2826f476 Look and feel v10 2019-03-29 13:26:26 +01:00
Nicolas ZABOURI
0ab6b15779 FIX missing hook printFieldListFooter 2019-03-28 17:27:30 +01:00
Laurent Destailleur
a34f4c2806
Merge pull request #10909 from IonAgorria/fix-line-dates 
FIX: Disallow line start date after end date
 2019-03-26 19:43:11 +01:00
Laurent Destailleur
12c5844065 Look and feel v10 2019-03-26 11:55:22 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
82381533dd Better responsive 2019-03-25 09:14:28 +01:00
Ion
7bfa49b29c FIX: Disallow line start date > end date 2019-03-24 14:30:00 +01:00
Laurent Destailleur
28fede950f Hidden option CHANGE_ORDER_CONCAT_DESCRIPTION were renamed into 
MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION
 2019-03-22 13:00:48 +01:00
Philippe GRAND
c13a1dbc63 translation 2019-03-18 13:45:24 +01:00
Lionel VESSILLER
971037d755 Fix dol_print_date error for real dates in cotract card 2019-03-15 08:42:00 +01:00
Laurent Destailleur
98ca9bf17a Reduce quantity of string to translates 2019-03-12 19:44:59 +01:00
Joan Louis
17647de4cc Fix extrafields calls from cards for Dolibarr 8 See #10803 2019-03-12 11:24:54 +01:00
Joan Louis
f326c75be7 Update call to extrafields from cards 2019-03-11 21:34:16 +01:00
Joan Louis
ee5753819e Update call to extrafields from cards 2019-03-11 14:22:04 +01:00
Laurent Destailleur
b710e28ffa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/admin/adherent.php
	htdocs/admin/barcode.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/langs/en_US/admin.lang
 2019-03-09 01:20:13 +01:00
Laurent Destailleur
57b9be53b3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/contrat/class/contrat.class.php
 2019-03-09 00:44:31 +01:00
Laurent Destailleur
4022d5f529 FIX Can not create contract with numbering module without autogen rule 2019-03-08 23:58:04 +01:00
Frédéric FRANCE
f283782445
change visibility 2019-03-04 19:57:46 +01:00
Frédéric FRANCE
bf1e1d6a57
replace html by html5 in contrat 2019-03-03 09:37:43 +01:00
Laurent Destailleur
4f9981063f Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing 2019-03-02 18:26:50 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +01:00
Frédéric FRANCE
bd2e541fd6
add visibility 2019-03-01 18:28:51 +01:00
Laurent Destailleur
b3fb0eaf5b
Merge branch 'develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 15:48:31 +01:00
Laurent Destailleur
2448d1deaa fk_projet -> fk_project 2019-02-27 15:32:18 +01:00
Frédéric FRANCE
81f2f99db5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-26 21:16:01 +01:00
Laurent Destailleur
3ec2338c2d Look and feel v10 2019-02-26 19:37:32 +01:00
Frédéric FRANCE
1c07006015
wip 2019-02-25 21:36:27 +01:00
Laurent Destailleur
0a83bc474c
Merge pull request #10635 from grandoc/new_branch_19_02_2019 
update with html5 compliant code
 2019-02-23 14:09:17 +01:00
Laurent Destailleur
afae29198d Missing function 'getFormatedCustomerRef' and 'getFormatedsupplierRef' 2019-02-21 17:03:24 +01:00
Philippe GRAND
3a2b5e28c4 update with html5 compliant code 2019-02-19 17:17:11 +01:00
Philippe GRAND
f24356ae10 update with html5 compliant code 2019-02-19 17:08:35 +01:00
Philippe GRAND
5b7294e9e1 update with html5 compliant code 2019-02-19 17:06:25 +01:00
Philippe GRAND
2c59569074 update with html5 compliant code 2019-02-19 17:02:07 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Laurent Destailleur
57f81217ee Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/localtax/index.php
	htdocs/compta/tva/index.php
 2019-02-03 21:14:44 +01:00
Laurent Destailleur
a520642d97 FIX Price in combo list of service does not use the correct price level 2019-02-03 19:54:55 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
03701fa091
psr2 2019-02-02 18:25:01 +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
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
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
3cca0df28e Support getFormatedCustomerRef into contract list 2019-01-22 10:39:06 +01:00
Laurent Destailleur
8950720fb5 NEW Add getFormatedCustomerRef and getFormatedSupplierRef methods 2019-01-21 15:22:35 +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
43a2b5b1e2 update with html5 compliant code 2019-01-19 12:29:41 +01:00
Laurent Destailleur
5130019003 css 2019-01-17 19:27:26 +01:00
Laurent Destailleur
3571eaee3d
Merge branch 'develop' into NEW_change_order_concat_desc 2018-12-14 17:44:08 +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
Ferran Marcet
555698a3af Qual: Better management of select type of lines 2018-12-13 10:36:30 +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
602986ced8 Merge remote-tracking branch 'origin/7.0' into 7.0 
# Conflicts:
#	htdocs/comm/propal/class/propal.class.php
#	htdocs/commande/class/commande.class.php
#	htdocs/expensereport/class/expensereport.class.php
#	htdocs/fourn/class/fournisseur.commande.class.php
 2018-12-03 12:33:18 +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
Ferran Marcet
d8537a3c76 FIX Lines are not inserted correctly if VAT have code 2018-11-27 11:36:31 +01:00
Thibault Descamps
1cc130e5f6 NEW : conf to change concat desc order 2018-11-21 09:57:44 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +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
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
Laurent Destailleur
bf2c521988 Fix warning 2018-11-05 09:55:00 +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
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
dbbcb6f8a1
code comment api contract 2018-10-26 22:30:48 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Frédéric FRANCE
fa78ab7c66
do not trim int 2018-10-16 23:20:13 +02:00
Maxime Kohlhaas
d4d921b1cc Add massaction generate on main lists 2018-10-14 16:27:59 +02:00
Philippe GRAND
62c602e821 Standardize and update code 2018-10-10 08:50:23 +02:00
Laurent Destailleur
d776fc423e Fix search criterai of contract 2018-10-08 00:52:21 +02:00
Laurent Destailleur
9f5e44c568 Fix search criterai of contract 2018-10-08 00:51:08 +02:00
Laurent Destailleur
6ed67ea77f Clean code 2018-10-01 13:54:45 +02:00
Laurent Destailleur
adc36e7d63 Clean code 2018-10-01 00:20:47 +02:00
Laurent Destailleur
e2f450aa8c Fix regession losing description. 
Rename updateligne into updateline.
 2018-09-28 16:15:17 +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
6b8baab7b4
Merge pull request #9535 from frederic34/patch-18 
reduce complexity of contrat class
 2018-09-18 15:04:48 +02:00
Laurent Destailleur
9415486059 Unique extrafields are reset when cloning contract 2018-09-16 22:13:29 +02:00
Frédéric FRANCE
122275f2a7
reduce complexity of contrat class 2018-09-16 18:58:59 +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
Laurent Destailleur
d9ffba72f0 Fix use fetch_object instead of fetch_array 2018-09-16 10:03:47 +02:00
Frédéric FRANCE
6744733730
add hook formconfirm to contractcard 2018-09-13 14:22:45 +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
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
Philippe GRAND
11d75573be Standardize and update code 2018-09-05 12:21:13 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Philippe GRAND
3de16a145e Standardize and update code 2018-09-02 11:08:41 +02:00
Philippe GRAND
c4f05aff28 Standardize and update code 2018-09-02 10:42:31 +02:00
Frédéric FRANCE
3e723af018
start changing phpcs:ignore 2018-09-01 23:46:13 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Philippe GRAND
f77dd2ebc7 Standardize and update code 2018-09-01 15:13:59 +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
3b1cf41823 Fix eol 2018-09-01 12:17:52 +02:00
Laurent Destailleur
b863b5176d
Merge pull request #9322 from grandoc/new_branch_29_08_2018 
New branch 29 08 2018
 2018-09-01 12:11:01 +02:00
Philippe GRAND
3a8bde227b Standardize and update code 2018-08-31 19:26:08 +02:00
Philippe GRAND
edaa575435 Standardize and update code 2018-08-31 18:36:15 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Philippe GRAND
46b00705b3 Fix white spaces 2018-08-29 12:54:03 +02:00
Philippe Grand
65f9013634
Update api_contracts.class.php 2018-08-29 11:35:51 +02:00
Philippe GRAND
881ab54cf0 typo and translation 2018-08-29 11:06:20 +02:00
Philippe GRAND
8785c10ad8 typo 2018-08-29 10:52:27 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Laurent Destailleur
2db84a679e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/modulebuilder/index.php
 2018-08-28 02:35:45 +02:00
Laurent Destailleur
8cacda1c1e Fix error message 2018-08-27 14:45:20 +02:00
Philippe GRAND
215677c972 Standardize and update code 2018-08-23 18:17:09 +02:00
Philippe GRAND
504b0e3d16 Update and standardize code 2018-08-22 18:34:50 +02:00
Philippe GRAND
0ffad50974 Update and standardize code 2018-08-22 11:24:31 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Laurent Destailleur
0799970804
Merge pull request #9248 from frederic34/FunctionDeclaration 
function declaration
 2018-08-21 13:41:56 +02:00
Laurent Destailleur
4e02b134da Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-16 14:50:04 +02:00
Laurent Destailleur
7d6e25789c Fix popup customer 2018-08-15 15:07:23 +02:00
Frédéric FRANCE
7bb781eea8
function declaration 2018-08-15 14:28:34 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +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
12e21b4886 FIX update extrafields 2018-08-12 16:29:26 +02:00
Frédéric FRANCE
62b83412ee
test phpcs v3 2018-08-09 11:31:48 +02:00
Philippe GRAND
948647f3f9 comment translation 2018-08-04 14:17:51 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Laurent Destailleur
982a1ffbaf NEW Automatic position of scroll when creating an extrafield 2018-06-30 14:22:05 +02:00
Laurent Destailleur
f292c1c662 Option to solve autovalidation 2018-06-27 01:33:02 +02:00
Laurent Destailleur
a0e97c7640 Option to solve autovalidation 2018-06-27 01:31:53 +02:00
Laurent Destailleur
af9d2c3b5a
Merge pull request #9008 from grandoc/new_branch_22_06_2018 
clean and update code
 2018-06-24 13:47:26 +02:00
Laurent Destailleur
6dba88ab6e Several fixes in look and feel 2018-06-23 14:23:07 +02:00
Laurent Destailleur
27a27e02a1 Fix css 2018-06-22 22:53:53 +02:00
Philippe GRAND
afda5288a8 clean and update code 2018-06-22 16:27:11 +02:00
Laurent Destailleur
81497687e9 Fix missing oldcopy in trigger call 2018-06-22 10:55:36 +02:00
Laurent Destailleur
1a8afeff2a Fix error message 2018-06-20 23:50:50 +02:00
Laurent Destailleur
ca5f27636b
Merge pull request #8978 from grandoc/new_branch_17_06_2018 
clean and update code
 2018-06-18 11:16:00 +02:00
Philippe GRAND
ddbf5e59e1 clean and update code 2018-06-18 10:12:19 +02:00
Inovea Conseil
d5a3e63e05 Fix missing paramater for generateDocument 2018-06-15 09:47:28 +02:00
Laurent Destailleur
758e5a51a5 Fix contextpage was not saved in forms 2018-06-08 19:35:53 +02:00
Laurent Destailleur
eb9321f2b8 css 2018-06-08 17:53:13 +02:00
Laurent Destailleur
034ce7e55d CSS 2018-06-02 10:36:22 +02:00
Laurent Destailleur
7c0afbe025 Clean code 2018-05-31 17:12:08 +02:00
Frédéric FRANCE
30a3b95368
loadlangs 2018-05-26 20:32:23 +02:00
atm-quentin
8cd6c72a2f NEW advanced rights 2018-05-07 10:04:43 +02:00
atm-quentin
ec5e84075e NEW Rights to ignore price min 2018-05-03 10:18:38 +02:00
Laurent Destailleur
82a8513aed Standardize code 2018-04-29 19:52:14 +02:00
Laurent Destailleur
a86f1c8fde FIX Can't invoice contract once it was closed 2018-04-24 14:46:16 +02:00
Laurent Destailleur
461ae46cc4 FIX When on a high page and searching for a small result, list was not 
visible.
 2018-04-24 11:37:57 +02:00
Laurent Destailleur
315d5bad39 FIX Error in ContractLigne not return to Contract 2018-04-23 15:07:50 +02:00
Laurent Destailleur
7065d16d85 FIX Error in ContractLigne not return to Contract 2018-04-23 10:35:11 +02:00
Laurent Destailleur
54979bf3b3
Merge pull request #8660 from grandoc/new_branch_22_04_2018 
update code
 2018-04-22 20:30:59 +02:00
Laurent Destailleur
ac89951acd
Merge pull request #8647 from fmarcet/develop 
New: Add same parameters on 'printFieldListTitle' hooks
 2018-04-22 19:35:09 +02:00
Philippe GRAND
05f4e3c68e update code 2018-04-22 11:14:01 +02:00
Laurent Destailleur
c81c744aaf Clean deprecated var 2018-04-21 13:14:58 +02:00
Ferran Marcet
6ced1a3264 New: Add same parameters on 'printFieldListTitle' hooks 2018-04-20 10:38:16 +02:00
Laurent Destailleur
5794e38c54 FIX Close date not visible in service list 2018-04-20 09:45:49 +02:00
Philippe GRAND
ed087161f4 clean and update code 2018-04-19 16:50:47 +02:00
Laurent Destailleur
bbfc4a3e17 NEW Look and feel v8 - Show Picto "+" on all links "Add record" 2018-04-18 03:26:15 +02:00
Laurent Destailleur
c551bf20e2 sys 2018-04-17 21:06:26 +02:00
Frédéric FRANCE
aec601dbcc
display total on contract service list 2018-04-17 15:40:12 +02:00
Laurent Destailleur
0d0da234b1 Lowercase NULL, TRUE, FALSE according to PSR2 2018-04-16 13:51:16 +02:00
Laurent Destailleur
8fbde88872 Look and feel v8 2018-04-15 17:37:49 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
All-3kcis
880fa55dd5 display user-friendly filesize 2018-04-12 15:29:22 +02:00
Laurent Destailleur
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list 
NEW: generalize use of button to create new element from list
 2018-04-05 16:40:15 +02:00
Laurent Destailleur
43f8834b28 Uniformize code with the new module builder framework 2018-03-31 18:48:27 +02:00
Marc de Lima Lucio
0366e645d5 NEW: generalize button to create object from list, for most of the lists 2018-03-30 16:54:38 +02:00
Laurent Destailleur
34c26dffc7 Use constant for contract line status 2018-03-30 15:46:08 +02:00
Laurent Destailleur
6f6395e309 Code comment 2018-03-27 23:01:54 +02:00
Laurent Destailleur
6ef1dbbe0f FIX auto open contract if one result found 2018-03-24 18:28:06 +01:00
Laurent Destailleur
aa859f980d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-03-22 14:21:17 +01:00
Laurent Destailleur
a9944e1d23 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	ChangeLog
	htdocs/contrat/card.php
 2018-03-22 14:19:34 +01:00
Laurent Destailleur
ed2d9f179b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/card.php
 2018-03-22 14:12:37 +01:00
atm-ph
2094c48b7f Fix missing folder with multientity 2018-03-21 12:14:04 +01:00
atm-ph
cad7bdc74b Fix documents are lost if we rename contrat ref 2018-03-21 11:54:25 +01:00
Laurent Destailleur
d7ad899839 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/conf.class.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/holiday/list.php
 2018-03-20 14:52:27 +01:00
Laurent Destailleur
8cf2d4eb45 Fix filter on holiday statut 
Fix tr/td balance for extrafields on lines
 2018-03-20 10:10:21 +01:00
Laurent Destailleur
d4ae0395ed NEW Look and feel v8: Use a different picto for delete and unlink 2018-03-18 19:13:42 +01:00
Laurent Destailleur
cb1069cf0b Use font-awesome for the picto to move/transfer a line 2018-03-17 13:21:27 +01:00
Laurent Destailleur
852bf8dab7 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/societe/class/societe.class.php
 2018-03-15 01:57:35 +01:00
Ferran Marcet
4d4a204f7f Merge remote-tracking branch 'upstream/7.0' into 7.0 2018-03-14 11:11:54 +01:00
Ferran Marcet
e47dda72e7 Fix: Activate all also if there are inactive services 2018-03-14 11:08:38 +01:00
Laurent Destailleur
93f4d6fdcd Translation 2018-03-11 21:34:38 +01:00
florian HENRY
594497d085 fix scrunitizer 2018-03-10 10:34:11 +01:00
Laurent Destailleur
63eecb46a9 Fix missing hook init 2018-03-02 17:32:54 +01:00
Laurent Destailleur
0a27855141 CSS 2018-03-01 18:21:47 +01:00
Laurent Destailleur
132ee2c788 CSS 2018-03-01 16:48:12 +01:00
Laurent Destailleur
6f29a574cf CSS 2018-03-01 02:37:18 +01:00
Laurent Destailleur
bbef8b0ce6 Memory optimization 2018-02-27 21:33:17 +01:00
Laurent Destailleur
04934cc4aa Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/projet/tasks/time.php
 2018-02-27 19:18:43 +01:00
Laurent Destailleur
bca2927da0 FIX css border missing 2018-02-27 19:03:42 +01:00
Laurent Destailleur
48e042b669 FIX css border missing 2018-02-27 16:33:40 +01:00
Laurent Destailleur
8d963adb43 Fix error message 2018-02-26 21:30:31 +01:00
Laurent Destailleur
0cc84ab92f FIX Missing restore_lastsearch_values 2018-02-26 21:21:28 +01:00
Laurent Destailleur
fd1d900f7f FIX: Properties updated if update successfull. 
Conflicts:
	htdocs/contrat/class/contrat.class.php
 2018-02-26 21:20:31 +01:00
Laurent Destailleur
3c552cec15 FIX Missing restore_lastsearch_values 2018-02-26 21:16:40 +01:00
Laurent Destailleur
941a8e5e2b FIX: Properties updated if update successfull. 2018-02-26 20:12:29 +01:00
Laurent Destailleur
41638e6dff Fix back link of look and feel v7 2018-02-26 09:20:05 +01:00
Laurent Destailleur
029ef534d0 Clean deprecated code (property "special" removed from mod descriptor) 2018-02-25 10:55:02 +01:00
Laurent Destailleur
0a79550f43 Fix oldcopy must be saved before update_extras 2018-02-23 16:11:00 +01:00
Laurent Destailleur
9114a28e88 Fix: missing the reposition 2018-02-21 22:43:25 +01:00
Laurent Destailleur
f03fcef2d5 Fix: missing the reposition 2018-02-21 22:41:02 +01:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
Laurent Destailleur
423918b9ff Include notrigger 2018-02-21 11:41:52 +01:00
Laurent Destailleur
72c1357c9b NEW Section of files generated by mass action not visible if empty 2018-02-21 11:02:45 +01:00
Laurent Destailleur
c4130730cb Clean code around fetch_optionals() 2018-02-20 19:38:18 +01:00
Laurent Destailleur
8b54a80593 Fix oldcopy not saved before calling trigger 2018-02-20 19:20:03 +01:00
Laurent Destailleur
809ef1bd00 FIX Trigger *_MODIFY must be called when editing a property event extra. 
Clean duplicate trigggers "*_CLONE"
 2018-02-20 18:09:38 +01:00
Laurent Destailleur
346a0becac Propagate context 2018-02-20 13:20:24 +01:00
Laurent Destailleur
ab6d0d2530 Fix errors 2018-02-17 01:16:52 +01:00
Laurent Destailleur
540e3d6dc5 USe common name for triggers CONTRACT_SERVICE_ACTIVATE into 
LINECONTRACT_ACTIVATE and CONTRACT_SERVICE_CLOSE into LINECONTRACT_CLOSE
 2018-02-16 01:19:31 +01:00
Laurent Destailleur
6b74c79798 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-15 15:34:17 +01:00
Laurent Destailleur
47713e0264 Fix bug reported by scrutinizer 2018-02-15 15:32:43 +01:00
Laurent Destailleur
f1a9f81fb4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/website.lang
 2018-02-14 22:19:59 +01:00
Laurent Destailleur
7f8cbc0f62 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/adherents/type.php
	htdocs/contrat/services.php
	htdocs/contrat/tpl/linkedobjectblock.tpl.php
	htdocs/install/upgrade2.php
 2018-02-14 22:08:18 +01:00
Laurent Destailleur
15ab37b46e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-14 21:51:55 +01:00
Laurent Destailleur
b21feca9d7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-14 21:51:35 +01:00
Laurent Destailleur
3780a8b1d9
Merge branch 'develop' into new_charges_sociales_trigger 2018-02-14 20:48:16 +01:00
Laurent Destailleur
3b9eaf6a5e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 23:08:23 +01:00
Laurent Destailleur
88bdebb80f Fix label truncated 2018-02-12 23:08:01 +01:00
Maxime Kohlhaas
ef05171641 Fix : contract service list context was mixing up with service list from product/service module 2018-02-12 13:48:43 +01:00
Laurent Destailleur
976241da61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 03:21:48 +01:00
Laurent Destailleur
109c447171 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-02-12 03:21:37 +01:00
Laurent Destailleur
4d6f87e544
Merge pull request #8168 from simnandez/6.0 
Fix: Contracts not show price
 2018-02-12 03:13:31 +01:00
Laurent Destailleur
d731857fd0
Update linkedobjectblock.tpl.php 2018-02-12 03:13:12 +01:00
Laurent Destailleur
671fbd3d55 Code comment 2018-02-12 02:59:18 +01:00
Laurent Destailleur
c03ceb2205 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-02-12 02:56:51 +01:00
Laurent Destailleur
1757d4922c
Merge pull request #8158 from atm-john/new_contract_dom_elements 
New contract dom elements
 2018-02-12 02:36:30 +01:00
Juanjo Menent
67ce71bc48 Fix: Contracts not show price 2018-02-09 18:23:11 +01:00
John
2817ace0d2 Fix contract line extrafields save on add line 2018-02-09 15:47:18 +01:00
Laurent Destailleur
26ee7ec5be Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/errors.lang
 2018-02-08 17:27:36 +01:00
Laurent Destailleur
d10d9f0fb2 Fix scrutinizer 2018-02-08 17:22:07 +01:00
John
e775949d4b Merge branch 'develop' of github.com:Dolibarr/dolibarr into 6.0_add_dom_contract 2018-02-08 14:06:54 +01:00
John
8847293527 Add new html containers and somme html5 data-* for contract card. 2018-02-08 12:25:30 +01:00
Laurent Destailleur
0cc6654b06 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
 2018-02-04 13:25:00 +01:00
Laurent Destailleur
3cfb6aaa67 Fix missing trigger CONTRACT_MODIFY 2018-02-04 12:59:16 +01:00
Laurent Destailleur
42f8da7496 NEW Add trigger CONTRACT_MODIFY 2018-02-04 12:56:17 +01:00
Laurent Destailleur
956df63c87 Fix extrafields updated twice 2018-02-04 12:55:29 +01:00
Laurent Destailleur
ea15c1bfed Fix CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES 2018-02-04 10:50:58 +01:00
Laurent Destailleur
f57ea2682a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/notify.class.php
	htdocs/societe/class/societe.class.php
 2018-02-03 19:33:24 +01:00
Laurent Destailleur
9d0314dbae NEW Add option CONTRACT_SYNC_PLANNED_DATE_OF_SERVICES 2018-02-03 18:50:20 +01:00
Juanjo Menent
cdb63bada3 FIX: #7974 Contract - Invalid reference on the document 2018-01-26 18:13:55 +01:00
Laurent Destailleur
3a4ca8ae2b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-24 11:49:36 +01:00
Laurent Destailleur
54fb59d8db Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/paiement.php
 2018-01-24 11:45:43 +01:00
Maxime Kohlhaas
4c0dc21ca0 Fix validate contrat was not using force_number parameter 2018-01-18 14:07:32 +01:00
Laurent Destailleur
6676178435 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/contrat/card.php
 2017-12-28 09:56:40 +01:00
Laurent Destailleur
3ac413084f
Merge branch '6.0' into 6.0 2017-12-28 08:46:22 +01:00
Laurent Destailleur
56bc0dbd25
Merge pull request #7986 from atm-arnaud/FIX_contractline_trans_unactivate 
FIX trans unactivate on contractline
 2017-12-28 07:09:28 +01:00
Ferran Marcet
1c7b99d3dc Fix: Missing include for Project class 2017-12-26 12:13:35 +01:00
Laurent Destailleur
27a9a81f99 Fix link to contracts 2017-12-21 23:48:33 +01:00
Laurent Destailleur
aad0da2513 Fix maxi debug of APIs (clean output fields) 2017-12-21 16:50:18 +01:00
Laurent Destailleur
eab44f62b1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_builddoc.inc.php
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/notes.tpl.php
	htdocs/main.inc.php
	htdocs/product/inventory/tpl/inventory.tpl.php
	htdocs/societe/tpl/linesalesrepresentative.tpl.php
 2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960 FIX security vulnerability reported by ADLab of Venustech 2017-12-21 13:32:16 +01:00
arnaud
4ba039d229 FIX trans unactivate on contractline 2017-12-21 12:07:29 +01:00
Laurent Destailleur
1351a43a30 FIX Maxi debug of permission for users external or restricted to sales 
representatives
 2017-12-18 16:13:05 +01:00
Laurent Destailleur
247c380d18 Several fixes 2017-12-12 16:11:40 +01:00
Laurent Destailleur
af1028576d Fix on search all (trim search + search from smartphone). 2017-12-12 11:31:30 +01:00
Laurent Destailleur
1251807f54 Fix several pb in links to projects on create page 2017-12-12 10:37:51 +01:00
Laurent Destailleur
8d20473ffd Fix date of extrafields 2017-12-09 23:19:29 +01:00
Laurent Destailleur
1128b66b30 Fix ref of contract 2017-12-09 20:58:06 +01:00
Laurent Destailleur
cc813df2a5 Fix modulebuilder 2017-12-09 20:17:47 +01:00
Laurent Destailleur
f22e7ee24a Fixes 2017-12-09 17:29:19 +01:00
Laurent Destailleur
ce32da6217 Fix debugs APIs 2017-12-01 15:39:18 +01:00
florian HENRY
94285ae494 factorization of extrafeild into list 2017-11-27 15:24:29 +01:00
Laurent Destailleur
0b9a3087ea Fix bug reported by scrutinizer 2017-11-25 12:11:02 +01:00
Laurent Destailleur
9c22b5f335 Replace deprecated dol_print_graph with DolGraph 2017-11-23 20:24:05 +01:00
Laurent Destailleur
b93e35cdd2 Fix a lot of request to use the IN getentity instead of = 
Fix a lot of request to use left join on type of payment table
 2017-11-23 15:06:16 +01:00
Laurent Destailleur
4ad0d5df43 Fix scrutinizer issues 2017-11-19 16:55:28 +01:00
Laurent Destailleur
cf0d67d71c Generation of pdf become default value 2017-11-17 23:57:32 +01:00
Laurent Destailleur
97d38f32ad
Merge pull request #7822 from atm-maxime/new_contract_replicate_extraf 
New extrafields replicated on contract creation
 2017-11-17 13:20:10 +01:00
Laurent Destailleur
19d0283b63 Fix doxygen 2017-11-16 12:13:23 +01:00
Maxime Kohlhaas
1f5c2ec13f New extrafields replicated on contract creation 2017-11-15 21:20:30 +01:00
Laurent Destailleur
f68b2bdeca Use the confirmation when deleting from mass action everywhere. 2017-11-15 11:39:11 +01:00
Laurent Destailleur
c85acbfc11 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/modules/import/import_xlsx.modules.php
	htdocs/install/repair.php
 2017-11-14 19:47:33 +01:00
Laurent Destailleur
451d3ed8ed NEW Add API to activate/unactivate a contract 2017-11-14 17:51:04 +01:00
Laurent Destailleur
a12186a0b8 Use HTTP response code 304 instead of 500 when nothing is done 2017-11-14 01:26:02 +01:00
Laurent Destailleur
b5196b7164 FIX A lot of several fix on local taxes and NPR tax 2017-11-13 14:24:40 +01:00
Laurent Destailleur
836f6bf3c9 Fix search filter when using extrafields 'links' 2017-11-12 12:39:23 +01:00
Laurent Destailleur
d1860b87f8 NEW Add a confirmation for all mass action 'delete' 2017-11-11 16:34:11 +01:00
Laurent Destailleur
14a43ba4d2 FIX sort on a date that is result of a MIN with mysql 2017-11-07 13:33:24 +01:00
Laurent Destailleur
1b28c45e2c PERF Links in getNomUrl use only one tag a instead of 2. 2017-11-02 15:19:14 +01:00
Laurent Destailleur
b29f32171c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/contrat/card.php
	htdocs/core/lib/project.lib.php
	htdocs/filefunc.inc.php
 2017-10-30 18:22:26 +01:00
Laurent Destailleur
d569218162 Fix 'separate' extrafields must be visible by default. 
Sandardize name of list pages (must end with _list.php)
 2017-10-29 11:23:20 +01:00
Laurent Destailleur
cd5e43483e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/lib/project.lib.php
	htdocs/expedition/card.php
	htdocs/projet/class/task.class.php
 2017-10-28 22:08:16 +02:00
Maxime Kohlhaas
7c1d6251f7 Fix : contract lines from origin were containing all lines desc 2017-10-27 13:27:38 +02:00
Laurent Destailleur
e4645cf2c5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/blockedlog/class/blockedlog.class.php
	htdocs/contrat/card.php
	htdocs/societe/card.php
 2017-10-27 02:12:35 +02:00
Laurent Destailleur
9283aaf6aa Fix scrutinizer 2017-10-27 00:07:58 +02:00
Laurent Destailleur
8058712d47 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/contrat/class/contrat.class.php
	htdocs/product/list.php
 2017-10-26 17:06:11 +02:00
Laurent Destailleur
4f6304624a NEW Add api validate and close on contracts 2017-10-26 12:32:22 +02:00
atm-ph
08e83983d0 Fix empty extrafields if from origin 2017-10-26 09:40:12 +02:00
Laurent Destailleur
202712be94 Work on module builder 2017-10-25 22:02:07 +02:00
Laurent Destailleur
f24204c79a Error management after extrafield update 2017-10-24 19:04:40 +02:00
Laurent Destailleur
9f0f5eb5e8 Fix translation of extrafields type 2017-10-24 18:05:43 +02:00
Laurent Destailleur
ba434617dc FIX Missing function getLinesArray 2017-10-23 14:44:06 +02:00
Laurent Destailleur
a4b152ff1b Fix get lines of contracts done in one request instead of 2 2017-10-23 13:28:45 +02:00
Laurent Destailleur
728e36f70f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/api/index.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/class/api_invoices.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/actions_sendmails.inc.php
 2017-10-22 01:43:33 +02:00
Laurent Destailleur
f7556e7ad2 FIX make of link to other object during creation 2017-10-19 19:06:48 +02:00
Laurent Destailleur
7f85d73001 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contrat/card.php
	htdocs/expensereport/card.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/paiement/card.php
	htdocs/livraison/card.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/societe/rib.php
	htdocs/supplier_proposal/list.php
	htdocs/user/card.php
 2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a Fix perm to delete files 2017-10-18 17:21:30 +02:00
Laurent Destailleur
ebe0664aff Merge branch 'develop' into scrutinizer-patch-3 2017-10-16 20:54:15 +02:00
Laurent Destailleur
45ac8367bd NEW Add API for contracts 2017-10-16 17:56:59 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-16 06:47:05 +00:00
Scrutinizer Auto-Fixer
165741517e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-13 11:28:26 +00:00
Laurent Destailleur
7c9993ef0e Various fixes 2017-10-13 12:14:57 +02:00
Laurent Destailleur
8c5cf9ea45 Fix date output 2017-10-12 18:04:47 +02:00
Laurent Destailleur
c771ce524f Fix lose filter 2017-10-07 18:25:04 +02:00
Laurent Destailleur
5d24aa4830 Fix sql 2017-10-07 14:54:31 +02:00
Laurent Destailleur
ad57a8480f Merge pull request #7462 from tysauron/patch-15 
NEW Adding Field "First date of expire" + filter on contract list
 2017-10-07 14:16:31 +02:00
Laurent Destailleur
6271c90904 Update list.php 2017-10-07 14:15:47 +02:00
Laurent Destailleur
b91667e69c Merge pull request #7579 from OPEN-DSI/fix_0003 
New add test dates order for start and end dates of a line of a contract
 2017-10-07 13:16:53 +02:00
Laurent Destailleur
d1ad6e0263 Update card.php 2017-10-07 13:16:39 +02:00
KHELIFA
dadd3842a0 Fix concat desc of lines when create contract from proposal or other 2017-10-06 18:01:03 +02:00
KHELIFA
e715a680bf New add test dates order for start and end dates of a line of a contract 2017-10-06 17:58:15 +02:00
Laurent Destailleur
9d6498f2a4 NEW Search filters in lists are restored when using "back to list" 2017-10-03 14:50:52 +02:00
Laurent Destailleur
f007f9e7e5 NEW Add new property visible dy default on lists on extrafields 2017-09-29 13:26:44 +02:00
Laurent Destailleur
f1a563625b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
 2017-09-26 22:11:00 +02:00
florian HENRY
eacb221ffe fix : add missing column into service's contract lines 2017-09-26 15:15:39 +02:00
Laurent Destailleur
c9e9f60f8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-09-25 19:55:52 +02:00
Laurent Destailleur
e3da4188e2 GETPOST must not clean data for text input. 2017-09-25 00:16:52 +02:00
Laurent Destailleur
4b92e2a705 Fix localtax 2017-09-24 23:55:44 +02:00
Laurent Destailleur
f990667b1a NEW Can send email from the member card using email templates. 2017-09-22 17:48:38 +02:00
Laurent Destailleur
6d7db96359 NEW Option "one email per recipient" when using bulk actions emails. 2017-09-22 16:31:05 +02:00
Laurent Destailleur
d4bde2a4ea Fix date substitution for contracts 2017-09-22 15:12:36 +02:00
Laurent Destailleur
252f038468 Mutualize code of substitutions for emails 2017-09-22 14:34:31 +02:00
tysauron
e6e3e8ca68 Adding Field "First date of expire" + filter 
Ajout d'une colonnes "1er date de fin" avec filtre par mois année et choix "<" ou ">" 
Le filtre exclue toutes les lignes fermé.
Permet de voir les contrat a renouvelé prochainement
Présélection du mois encours.
 2017-09-22 02:43:42 +02:00
florian HENRY
8f19ffd097 Fix contract class for date 2017-09-21 12:22:10 +02:00
Laurent Destailleur
04e1458a3f Fix clean parameters 2017-09-19 22:03:44 +02:00
Laurent Destailleur
8dfa87fcf6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-19 19:30:28 +02:00
Laurent Destailleur
0536d6cbed FIX #7330 2017-09-18 15:46:17 +02:00
Laurent Destailleur
aea7318fae Fix search on ref customer 2017-09-18 00:07:00 +02:00
Laurent Destailleur
ab5724e7ff Mutualize code for forms to send emails. Remove thousand line of code. 2017-09-17 17:12:14 +02:00
Laurent Destailleur
e014ac6ea9 NEW Send by email available in bulk for expense report 2017-09-16 22:03:25 +02:00
Laurent Destailleur
0fec777d0e NEW On bulk email from a list, can uncheck "Join main document". 
NEW Show direct preview link on contract
 2017-09-16 18:31:30 +02:00
Laurent Destailleur
630dc92a13 NEW Mass PDF Merging is available on contracts 2017-09-16 15:39:52 +02:00
Laurent Destailleur
961d475a9d More complete substitution system. 
Add __CONTRACT_NEXT_EXPIRATION_DATE__  and
__CONTRACT_NEXT_EXPIRATION_DATETIME__
 2017-09-16 03:45:29 +02:00
Laurent Destailleur
a4086b52ef NEW Can send email from contract card 2017-09-16 01:34:15 +02:00
Laurent Destailleur
56460f877e Merge pull request #7404 from atm-florian/dev_add_search_on_extrafield_contractline 
Add search on extrafields on contract service list
 2017-09-15 15:58:30 +02:00
Laurent Destailleur
3dbf4cf176 Update services.php 2017-09-15 15:58:02 +02:00
Laurent Destailleur
3c7c53f321 Update services.php 2017-09-15 15:55:43 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
florian HENRY
db319803ec add sreach on extrafeilds on contract service list 2017-09-15 12:17:18 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
Laurent Destailleur
149ab80b3a The event array of an object is visible even if no event yet recorded. 2017-09-13 14:18:36 +02:00
Laurent Destailleur
c8cb66d227 Missing translation 2017-09-11 02:54:06 +02:00
Laurent Destailleur
259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php
 2017-09-08 13:30:54 +02:00
Laurent Destailleur
bde293af22 Fix filter on extrafield with type sellist 2017-09-07 15:34:25 +02:00
Laurent Destailleur
5c7d2ffdc2 Fix get of contractlineid 2017-09-04 12:22:03 +02:00
Laurent Destailleur
c5567fafd4 Enhancement for smartphone 2017-09-04 09:25:53 +02:00