Commit Graph

89109 Commits

Author SHA1 Message Date
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
florian HENRY
0453dd8f09 fix php warning : count parameters must be countable 2020-08-20 16:39:14 +02:00
stickler-ci
3c108e8bbf Fixing style errors. 2020-08-20 13:31:48 +00:00
Christian Foellmann
179fc2e70a hide other eatby sellby dates 2020-08-20 15:27:34 +02:00
StephaneLesage
ad6fe8c6b6 NEW: Products Import/Export 'default warehouse' and 'use batch number' fields 2020-08-20 13:51:17 +02:00
Christian Foellmann
a5b4fcedb7 hide eatby sellby in reception 2020-08-20 12:48:23 +02:00
Laurent Destailleur
95c25bc1b7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-08-20 12:21:55 +02:00
Laurent Destailleur
fbb162aa9b Trans 2020-08-20 12:21:40 +02:00
Frédéric FRANCE
b4d2bf98fa Use of undefined constant state - assumed 'state' 2020-08-20 12:14:40 +02:00
Christian Foellmann
b74113e2eb hide eatby sellby on expedition 2020-08-20 12:13:27 +02:00
Christian Foellmann
b777c62557 hide eatby sellby on product/stock/product 2020-08-20 12:13:05 +02:00
Sekan, Tobias
546571a6f8 Show place from events on import calender 2020-08-20 08:20:00 +02:00
Bernard Saulme
d947ade7db Update adherent.class.php
NEW Add _TYPE__ substitution key
2020-08-19 21:19:56 +02:00
Mr Matthew Sidnell
c2a81341ad Updated Lint Issies 2020-08-19 16:27:00 +01:00
Matt Sidnell
b3f078a687 Updated the categories API to allow projects as type 2020-08-19 16:20:16 +01:00
Matt Sidnell
a1f9005aa3 Merge remote-tracking branch 'upstream/develop' into PSdevelop 2020-08-19 16:17:30 +01:00
Christian Foellmann
df3fcec6c6 hide dates on erassortlot.php 2020-08-19 16:44:45 +02:00
Christian Foellmann
2873e6bdca hide dates in productlot_list 2020-08-19 16:33:41 +02:00
stickler-ci
8191447007 Fixing style errors. 2020-08-19 16:33:41 +02:00
Christian Foellmann
b6af4014de hide eatby, sellby dates 2020-08-19 16:33:41 +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
6b36502e1e Merge pull request #14498 from aspangaro/12.0_p6
Fix Accountancy - Show label account in page already bind
2020-08-19 14:31:09 +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
c7b6f4e0c7 Merge pull request #14503 from AurelBichop/develop
FIX|fix #14502 fix to create a task for a project with api
2020-08-19 14:15:19 +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
Alexandre SPANGARO
fbd4323dd8 Fix Accountancy - Show label account in page already bind 2020-08-19 06:01:10 +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
Alexandre SPANGARO
3e80c71713 NEW Accountancy - Add options to disable binding on sales, purchases & expense reports independently of the modules 2020-08-18 07:38:46 +02:00