Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
91,506 Commits 36 Branches 189 Tags
eb0fd1674d26a8157ff133173f9177ee6a23e81f
Commit Graph

21986 Commits

Author SHA1 Message Date
Laurent Destailleur
461c37c4a8 Clean code 2020-08-21 01:28:40 +02:00
Laurent Destailleur
ad0625b6ec Debug posting message from ticket page 2020-08-21 01:11:22 +02:00
Laurent Destailleur
eb15a8e4db Enhance email collector module 2020-08-20 23:03:57 +02:00
Alexandre SPANGARO
f1f579ad67 Some fix on complete_head_from_modules 2020-08-20 22:17:34 +02:00
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
66f9f37f41 Minor code and doc enhancement 2020-08-20 19:00:43 +02:00
StephaneLesage
ad6fe8c6b6 NEW: Products Import/Export 'default warehouse' and 'use batch number' fields 2020-08-20 13:51:17 +02:00
Laurent Destailleur
7217dc3114 Better perf for phpunit on very large databases 2020-08-19 01:43:48 +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
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
58e25768a7 NEW Add PDF document templates for warehouses (list of stock) 2020-08-18 14:02:36 +02:00
Laurent Destailleur
e65e4a6d47 Beautify for of member module 2020-08-18 11:52:00 +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
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
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
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
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
Alexandre SPANGARO
498431fa6f NEW Add a start date to begin binding in accountancy 2020-08-17 15:27:05 +02:00
John Botella
6e1702c1a5 Fix infinite fetch object linked loop 2020-08-17 15:00:31 +02:00
Laurent Destailleur
d1323f55bb NEW: Module Reception (for a more accurate management of your 
receptions) moved from experimental to stable
 2020-08-17 14:10:43 +02:00
Laurent Destailleur
86a31d17a5 Better test 2020-08-17 04:34:53 +02:00
Laurent Destailleur
5987504fa5 Better test 2020-08-17 04:34:03 +02:00
asolslk
5a6f459db5 Update accounting.lib.php 2020-08-17 04:09:12 +02:00
Laurent Destailleur
75f8fe8276 Merge pull request #14427 from asolslk/patch-2 
FIX Visible 0 on accounting account
 2020-08-17 01:34:57 +02:00
Laurent Destailleur
4043e4ed3b Merge pull request #14429 from grandoc/new_branch_08_08_2020 
New branch 08 08 2020
 2020-08-17 00:04:08 +02:00
Laurent Destailleur
a76d4daff8 Merge pull request #14444 from fmarcet/11.0 
FIX: Visualization rights correction on last modified contacts box
 2020-08-16 23:37:23 +02:00
Laurent Destailleur
99809b487e Standardize code 2020-08-16 23:33:50 +02:00
Alexandre SPANGARO
27c36713d3 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2020-08-16 22:10:02 +02:00
Laurent Destailleur
c407a19563 Remove type= from script tags 2020-08-16 22:03:11 +02:00
Bernard Saulme
52b84a3ea2 Update functions.lib.php 2020-08-14 18:08:59 +02:00
Laurent Destailleur
73c1184195 Fix phpcs 2020-08-14 13:23:41 +02:00
Laurent Destailleur
65ceaac42e Better message 2020-08-14 12:56:17 +02:00
lvessiller
d5acc85ef0 FIX param entity in html form file 2020-08-14 12:18:28 +02:00
Laurent Destailleur
d8c6e17efd Fix travis 2020-08-14 11:59:51 +02:00
lvessiller
39a422ef94 FIX update margins rates on object line edit 2020-08-14 11:48:53 +02:00
Laurent Destailleur
a916f6af59 Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2020-08-14 11:09:06 +02:00
Laurent Destailleur
0381cf5665 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/modules/modPaymentByBankTransfer.class.php
	htdocs/filefunc.inc.php
 2020-08-14 11:08:53 +02:00
Laurent Destailleur
056a503200 Merge branch '11.0' of https://github.com/dolibarr/dolibarr into 12.0 
Conflicts:
	htdocs/product/composition/card.php
 2020-08-14 11:06:39 +02:00
Laurent Destailleur
74da63c0e4 Merge pull request #14448 from 418sec/develop 
Security Fix for Cross-site Scripting (XSS) - huntr.dev
 2020-08-14 03:17:35 +02:00
Laurent Destailleur
a2f50770f8 Merge pull request #14449 from cfoellmann/default-unit 
set default unit to `PRODUCT_USE_UNITS` value
 2020-08-14 03:04:09 +02:00
Laurent Destailleur
f0046672fc Merge pull request #14461 from atm-john/NEW_fill_service_dates 
NEW: new line template: hidden conf to fill service dates from the last service line
 2020-08-14 02:50:24 +02:00
lvessiller
f385e02c53 FIX title button attribute id empty 2020-08-13 17:43:18 +02:00