Commit Graph

52750 Commits

Author SHA1 Message Date
Laurent Destailleur
00a1893d93 Better help 2017-08-03 12:04:13 +02:00
Laurent Destailleur
8cd2235b4b Start to introduce cron for email reminder. 2017-08-03 11:42:22 +02:00
Laurent Destailleur
166e6cb68b Fix error counting in cron 2017-08-03 11:22:37 +02:00
Laurent Destailleur
dc6b1caae3 Fix list of cron jobs 2017-08-03 11:01:43 +02:00
Laurent Destailleur
46010d7892 Fix travis error 2017-08-03 04:00:50 +02:00
Laurent Destailleur
10662e24e0 Fix travis 2017-08-03 03:58:42 +02:00
Laurent Destailleur
81b11100b0 Prepare code to clone site an fetch external page 2017-08-03 01:45:31 +02:00
Laurent Destailleur
26730faa4c Enhance module builder. The file MyObject.txt is no more required. 2017-08-02 23:50:17 +02:00
Laurent Destailleur
c43df7cda8 Fix translation 2017-08-02 22:47:06 +02:00
Laurent Destailleur
92d45a9dc0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-02 22:31:05 +02:00
Laurent Destailleur
c38d59a4b6 Fix regression 2017-08-02 22:26:01 +02:00
Laurent Destailleur
fa752348c8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/various_payment/index.php
	htdocs/contact/list.php
	htdocs/langs/en_US/errors.lang
2017-08-02 17:56:09 +02:00
Laurent Destailleur
47ac770d93 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/expedition/card.php
	htdocs/expedition/list.php
2017-08-02 17:51:19 +02:00
Laurent Destailleur
52d39d9d5a Code comment 2017-08-02 17:45:35 +02:00
Laurent Destailleur
cc78a666a0 Fix missing status billed when WORKFLOW_BILL_ON_SHIPMENT is on 2017-08-02 17:15:51 +02:00
Laurent Destailleur
32eb2aba43 Sync transifex 2017-08-02 15:30:46 +02:00
Laurent Destailleur
c8b79214cd Fix translation 2017-08-02 14:53:42 +02:00
Laurent Destailleur
025ecd4ecc Fix default value for inventory code during a stock correction 2017-08-02 14:21:20 +02:00
Laurent Destailleur
2a92ee6008 Fix look and feel v6 2017-08-02 14:10:43 +02:00
Laurent Destailleur
01e1457a09 Fix typo 2017-08-02 13:46:56 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
Laurent Destailleur
33d6903d3f Fix bad recipient when using mass actions 2017-08-02 11:39:11 +02:00
Laurent Destailleur
71d49f1c6f Fix pb in ecm 2017-08-01 18:44:34 +02:00
Laurent Destailleur
f9dc628f0b Add tool to fix missing thumbs 2017-08-01 15:53:22 +02:00
Laurent Destailleur
19ba90f577 Fix creation of leave request 2017-08-01 13:17:27 +02:00
Laurent Destailleur
03b3f54c2c Fix class not found 2017-08-01 13:10:15 +02:00
Laurent Destailleur
b6a7ce6822 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-01 10:22:37 +02:00
Laurent Destailleur
ddee802324 Add second parameter in GETPOST 2017-08-01 10:22:09 +02:00
Laurent Destailleur
ae444b5781 Fix travis error 2017-08-01 01:28:07 +02:00
Laurent Destailleur
ba221650cf Start to work on using the jquery date selector. 2017-08-01 01:25:30 +02:00
Laurent Destailleur
a8d9dff506 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-31 19:32:08 +02:00
Laurent Destailleur
d2b662c671 Add field fk_user in bookkeeping (the user who valiated the accounting
document. Will be used for statistics purpose only).
2017-07-31 19:31:52 +02:00
Laurent Destailleur
7d6d4adcdb Fix combo for multicompany not visible where there is other hooks by
other modules
2017-07-31 18:16:41 +02:00
Laurent Destailleur
9cf6c43f8a Fix code comment 2017-07-31 15:51:08 +02:00
Laurent Destailleur
7ba5cf5958 Debug view of services lines 2017-07-31 13:48:00 +02:00
Laurent Destailleur
97e694f4d9 Fix look and feel v6 2017-07-31 12:43:07 +02:00
Laurent Destailleur
2f9f9ac80d Fix personal conf was not loaded 2017-07-31 11:56:20 +02:00
Laurent Destailleur
ecb4eebfac Fix filter of project in timespent view 2017-07-31 06:58:55 +02:00
Laurent Destailleur
13cbd597ad Fix filter lost 2017-07-31 06:20:32 +02:00
Laurent Destailleur
612ab65b72 Fix by adding a MULTICOMPANY_BACKWARD_COMPATIBILITY option. 2017-07-31 06:01:05 +02:00
Laurent Destailleur
2f68d446ef Fix on filter on project list 2017-07-31 04:52:27 +02:00
Laurent Destailleur
800aa4d5b6 Fix bad target 2017-07-31 04:49:54 +02:00
Laurent Destailleur
52875c08ff Fix missing translation keys 2017-07-31 04:24:13 +02:00
Laurent Destailleur
cfebbe3cc4 Fix css 2017-07-31 03:16:28 +02:00
Laurent Destailleur
7a69df08c5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/cron/class/cronjob.class.php
2017-07-31 02:39:42 +02:00
Laurent Destailleur
651bf525b0 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/cron/class/cronjob.class.php
2017-07-31 02:37:28 +02:00
Laurent Destailleur
067e5d81d9 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-07-31 02:36:23 +02:00
Laurent Destailleur
69357dd91c Merge pull request #7113 from atm-ph/new_develop_expense_report
NEW Add expense report rules and ik
2017-07-31 02:33:49 +02:00
Laurent Destailleur
8c287174b0 Merge pull request #7215 from aspangaro/6.0-d1
Debug various_payment
2017-07-31 02:32:46 +02:00
Laurent Destailleur
4f0b35874d Merge pull request #7216 from atm-florian/fix_7213
FIX : #7213
2017-07-31 02:29:36 +02:00