Commit Graph

74867 Commits

Author SHA1 Message Date
Laurent Destailleur
e7dea3cfe7
Merge pull request #10911 from leangjia/develop
Add China regions.
2019-03-26 19:23:08 +01:00
Laurent Destailleur
24af5cfab5
Merge pull request #10912 from Tetras-Libre/VATGrouped
TakePOS tickets : Grouped VAT
2019-03-26 19:22:40 +01:00
Laurent Destailleur
d8212d84df Debug emailcollector 2019-03-26 19:15:18 +01:00
Laurent Destailleur
f991d4ba99 Fix typo 2019-03-26 18:10:28 +01:00
Laurent Destailleur
4c4ad0548d Fix for creation of index composed with type 2019-03-26 17:56:46 +01:00
Laurent Destailleur
9eaef2ce7a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/export.php
	htdocs/langs/en_US/admin.lang
2019-03-26 12:40:36 +01:00
Laurent Destailleur
29fe65ed75 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-26 12:37:21 +01:00
Laurent Destailleur
e5f54bd14c FIX Remane of project 2019-03-26 12:35:44 +01:00
Laurent Destailleur
1787b31932 FIX setup of module export 2019-03-26 12:18:28 +01:00
Laurent Destailleur
524f171168 FIX old export models was not visible 2019-03-26 12:12:16 +01:00
Laurent Destailleur
12c5844065 Look and feel v10 2019-03-26 11:55:22 +01:00
Laurent Destailleur
c62d147c60 Auto clean search field to avoid to have 2 conflict search criteria 2019-03-25 16:47:20 +01:00
Laurent Destailleur
513ef1e727 Fix label short 2019-03-25 16:16:08 +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
liAnGjiA
62767fc059
Update llx_10_c_regions.sql 2019-03-25 10:16:41 +08:00
Laurent Destailleur
0f2dd5dc34 Add label for tax 2019-03-24 23:36:40 +01:00
Laurent Destailleur
c148157566 Remove duplicate translation keys 2019-03-24 23:29:22 +01:00
David Beniamine
b554ca2b73
Merge branch 'develop' into VATGrouped 2019-03-24 21:06:29 +01:00
Laurent Destailleur
fbc56d8413 WIP Preview pdf on expense report line 2019-03-24 20:37:57 +01:00
Laurent Destailleur
335af2f458 WIP Attach document to expense report lines 2019-03-24 20:33:00 +01:00
Laurent Destailleur
a950d8389e WIP Attach document to expense report lines 2019-03-24 20:22:05 +01:00
David Beniamine
4b61f0d606
Grouped VAT
Add an option to group VAT by rate in receipt
2019-03-24 20:17:41 +01:00
Laurent Destailleur
1409d1a2c8 Fix phpcs 2019-03-24 19:52:48 +01:00
Laurent Destailleur
89b7f1a040 Fix phpcs 2019-03-24 19:52:18 +01:00
Laurent Destailleur
3578c7cb0a Fix phpcs 2019-03-24 18:20:56 +01:00
leangjia
a207a699b6 Add China regions. 2019-03-25 00:21:09 +08:00
Laurent Destailleur
b2eee520df Fix phpcs 2019-03-24 16:11:12 +01:00
Laurent Destailleur
a16b6daa92 Look and feel v10 2019-03-24 16:10:03 +01:00
Laurent Destailleur
364deb1476 Fix phpcs 2019-03-24 16:09:48 +01:00
Laurent Destailleur
28abf5663b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/tva/clients.php
2019-03-24 15:06:16 +01:00
Laurent Destailleur
2034ac61ef Fix phpcs 2019-03-24 15:05:02 +01:00
Laurent Destailleur
41223702d7 Use radio button to select file on expense report line 2019-03-24 15:02:53 +01:00
Laurent Destailleur
152c27139f Doc 2019-03-24 14:54:04 +01:00
Laurent Destailleur
614b4afeb0 NEW The preview of PDF files generates 1 png file even if several pages. 2019-03-24 14:53:26 +01:00
Laurent Destailleur
949ef79227 Better error message 2019-03-24 14:26:16 +01:00
Laurent Destailleur
fad6efd86c WIP file attachment on expense report lines 2019-03-24 13:27:26 +01:00
Laurent Destailleur
5ff76e2c13 WIP file attachment on expense report lines 2019-03-24 12:15:19 +01:00
Laurent Destailleur
b54b687464 FIX bad check on type of expense report (mandatory status not working) 2019-03-24 11:05:07 +01:00
Laurent Destailleur
a0206d554e FIX bad check on type of expense report (mandatory status not working) 2019-03-24 11:04:32 +01:00
Laurent Destailleur
20f3af066c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/tva/clients.php
2019-03-23 22:44:14 +01:00
Laurent Destailleur
79ed4bc80b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/core/actions_massactions.inc.php
2019-03-23 22:36:04 +01:00
Laurent Destailleur
3ede626932 FIX If we build one invoice for several orders, we must put the ref of
order on the line to not lose information.

Conflicts:
	htdocs/commande/list.php
	htdocs/core/actions_massactions.inc.php
2019-03-23 22:34:10 +01:00
Laurent Destailleur
5666fbedac FIX If we build one invoice for several orders, we must put the ref of
order on the line to not lose information.
2019-03-23 22:30:52 +01:00
Laurent Destailleur
77843ddeba Allow use of log file or not for debugbar 2019-03-23 14:50:28 +01:00
Laurent Destailleur
df9e121ac6 Enhance the module debugbar. Do not scan the log anymore. 2019-03-23 14:37:54 +01:00
Laurent Destailleur
05c2ae6778 Remove warnings 2019-03-23 12:36:05 +01:00
Laurent Destailleur
ea010b9e01 Fix reduce side effects of debugbar 2019-03-23 12:15:42 +01:00
Laurent Destailleur
c569e71bc8 Fix remove warnings 2019-03-23 12:04:50 +01:00
Laurent Destailleur
82d90a201c WIP IFTTT setup 2019-03-22 19:20:54 +01:00