Commit Graph

77921 Commits

Author SHA1 Message Date
Laurent Destailleur
3ebcd191bd NEW Add filter rules "is answer" and "is not answer" in email collector 2020-08-20 20:16:38 +02:00
Laurent Destailleur
605642d96a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-20 19:01:03 +02:00
Laurent Destailleur
66f9f37f41 Minor code and doc enhancement 2020-08-20 19:00:43 +02:00
Laurent Destailleur
3281d5ec17 Merge pull request #14451 from josemariagomezroncero/patch-7
Bug, this option disable topic input.
2020-08-19 14:38:51 +02:00
Laurent Destailleur
4edf190264 Update mails_templates.php 2020-08-19 14:38:02 +02:00
Laurent Destailleur
25dfd32e0b Merge pull request #14456 from andreubisquerra/master
NEW: Delayed payment in TakePOS
2020-08-19 14:36:34 +02:00
Laurent Destailleur
ea478721e7 Update invoice.php 2020-08-19 14:36:03 +02:00
Laurent Destailleur
f57f729d40 Update invoice.php 2020-08-19 14:35:15 +02:00
Laurent Destailleur
cfc6ee4f67 Merge pull request #14497 from megalogi/patch-2
Passing $totalarray as parameter to printFieldListFooter Hook's
2020-08-19 14:16:26 +02:00
Laurent Destailleur
8057ccb223 Update task.class.php 2020-08-19 14:13:30 +02:00
abichotte
1c6a062486 FIX|fix #14502 fix to create a task for a project with api 2020-08-19 11:24:32 +02:00
Laurent Destailleur
90545ac443 css 2020-08-19 01:59:03 +02:00
Laurent Destailleur
7217dc3114 Better perf for phpunit on very large databases 2020-08-19 01:43:48 +02:00
Abdessalam@MEGALOGI
7f540ac6f0 Passing $totalarray as a parameter to printFieldListFooter Hook's
Sometimes, we need $totalarray to know nbfield or to display some vars in the footer of list.
2020-08-18 23:27:36 +01:00
Laurent Destailleur
53522fb8dd Fix popup on objects in modulebuilder 2020-08-18 18:41:36 +02:00
Laurent Destailleur
3e91d77920 FIX Update extrafields on warehouse 2020-08-18 18:35:40 +02:00
Laurent Destailleur
afe8f76a4a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/stock.php
2020-08-18 15:41:57 +02:00
Laurent Destailleur
3556004f02 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-18 15:35:43 +02:00
Laurent Destailleur
d4a502629e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/admin/stock.php
	htdocs/core/lib/ajax.lib.php
2020-08-18 15:35:34 +02:00
Laurent Destailleur
d21bda604d FIX Setup of stock increase/decrease 2020-08-18 15:27:17 +02:00
Laurent Destailleur
2f18ab0ea9 Debug generation of document for warehouse 2020-08-18 14:55:56 +02:00
Laurent Destailleur
964c4ef0d2 Standardize code. Use model_pdf. 2020-08-18 14:48:38 +02:00
Laurent Destailleur
6ce9d573e2 Trans 2020-08-18 14:13:36 +02:00
Laurent Destailleur
0172b76ea3 Add class reposition on some buttons 2020-08-18 14:05:35 +02:00
Laurent Destailleur
58e25768a7 NEW Add PDF document templates for warehouses (list of stock) 2020-08-18 14:02:36 +02:00
Juanjo Menent
e685a96716 FIX: Intervention lose html tags when updating 2020-08-18 13:44:50 +02:00
Laurent Destailleur
e65e4a6d47 Beautify for of member module 2020-08-18 11:52:00 +02:00
Laurent Destailleur
2ca0d67072 Removed section of files to download into POS 2020-08-18 11:20:02 +02:00
Laurent Destailleur
79802be58b Fix phpcs 2020-08-18 00:29:13 +02:00
Laurent Destailleur
e3145d4195 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-08-17 23:31:07 +02:00
Laurent Destailleur
4f93de6d0b Fix phpcs 2020-08-17 23:30:53 +02:00
Laurent Destailleur
b623d79525 Merge pull request #14488 from egils-consulting/patch-10
Update admin.lang
2020-08-17 22:21:09 +02:00
Laurent Destailleur
24703b8fe7 Merge pull request #14487 from aspangaro/13a4
NEW Add a start date to begin binding in accountancy
2020-08-17 22:20:46 +02:00
Laurent Destailleur
6662e216f7 Fix phpcs 2020-08-17 21:59:50 +02:00
Laurent Destailleur
e3beec3e1f Fix css 2020-08-17 20:57:44 +02:00
Laurent Destailleur
9f1e4a6da8 css 2020-08-17 20:55:02 +02:00
Laurent Destailleur
bd65e5612f Fix duplicate id 2020-08-17 20:06:01 +02:00
Laurent Destailleur
c63d54631c Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/categories/class/categorie.class.php
2020-08-17 19:59:17 +02:00
Laurent Destailleur
5952ae28b8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-17 19:54:32 +02:00
Laurent Destailleur
487d26c7db Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions.lib.php
2020-08-17 19:54:23 +02:00
Laurent Destailleur
68b6fdb508 Fix missing tags 2020-08-17 19:48:05 +02:00
Laurent Destailleur
0245eb102c Fix css on fields that are not mandatory 2020-08-17 19:44:06 +02:00
Laurent Destailleur
e891250fb3 Reduce log 2020-08-17 17:40:08 +02:00
Laurent Destailleur
e69e165bae css 2020-08-17 17:37:44 +02:00
Laurent Destailleur
69d73ac528 FIX Compatibility with modules without document generation
Conflicts:
	htdocs/core/actions_addupdatedelete.inc.php
2020-08-17 16:08:38 +02:00
Laurent Destailleur
8bfa6df1a6 FIX Update extrafields on line only if it is supported
Conflicts:
	htdocs/modulebuilder/template/class/myobject.class.php
2020-08-17 16:06:36 +02:00
Laurent Destailleur
bdcb945dda Work on inventory 2020-08-17 16:04:12 +02:00
Laurent Destailleur
c3e3baaca0 FIX Compatibility with modules without document generation 2020-08-17 15:54:07 +02:00
Laurent Destailleur
8e00c9c304 FIX Update extrafields on line only if it is supported 2020-08-17 15:53:33 +02:00
Egil Priskorn
bf18f56056 Update admin.lang
Small typo
2020-08-17 15:33:36 +02:00