Commit Graph

1550 Commits

Author SHA1 Message Date
Laurent Destailleur
75290d1bd4 Update contrat.class.php 2020-10-15 20:26:12 +02:00
Laurent Destailleur
c3a02d0391 Update contrat.class.php 2020-10-15 20:24:26 +02:00
Alfredo Altamirano
4a3ffbb6d4 FIX #14927 Change ContratLigne property type to product_type
This bug is produced because the ContratLigne class gives a property type instead of a product_type
2020-10-14 22:17:50 -05:00
Laurent Destailleur
aaf9aef5c8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/contrat/list.php
2020-03-06 14:17:21 +01:00
ATM-Nicolas
a9d7bbc2ed FIX : Remove unexisting link 2020-03-06 09:52:19 +01:00
gauthier
01b9c42670 FIX : timezone must be tzserver and not tzuser as well as on contract card 2020-02-26 15:02:42 +01:00
atm-greg
f63893a90c FIX date filter not used if no operator 2020-01-24 15:10:57 +01: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
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +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
9a7113f4f5 FIX Update the file index table when we validate/rename a ref. 2019-07-28 22:26:55 +02:00
Laurent Destailleur
a68d9fc5e6 Fix css 2019-06-25 23:31:29 +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