Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
96,756 Commits 36 Branches 189 Tags
49faedae6fef9775b889a063921ee252aa06ffad
Commit Graph

386 Commits

Author SHA1 Message Date
Laurent Destailleur
acb7b30eb0 Merge pull request #16507 from frederic34/add_rule 
Add rule
 2021-03-02 12:52:03 +01:00
Laurent Destailleur
f1f950e8b7 Close #16395 - Can filter on proposal source in list 2021-03-02 00:11:15 +01:00
Frédéric FRANCE
a4e25359e7 add missing rule 2021-03-01 20:37:16 +01:00
Alexandre SPANGARO
abc93446bb Fix list proposal 2021-03-01 04:12:15 +01:00
Frédéric FRANCE
5931051c88 code syntax comm directory 2021-02-23 18:59:19 +01:00
Alexandre SPANGARO
2cd181b86d Code enhanced - Standardize field name #14697 2021-02-21 22:07:58 +01:00
Alexandre SPANGARO
042038d185 Code enhanced - Standardize field name #14697 2021-02-18 22:42:55 +01:00
Laurent Destailleur
026259ebd7 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ajax.lib.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/product/fournisseurs.php
 2021-02-15 13:12:27 +01:00
Laurent Destailleur
8b125d8076 Fix MVC. Actions must be before output. 2021-02-10 16:44:20 +01:00
Laurent Destailleur
beb9f4f1e9 Fix 2 lines on one line when there is 2 or more sale representatives 2021-02-09 21:35:50 +01:00
Laurent Destailleur
8041ef641a Merge branch 'develop' into dev_typent_jax_workcorrectly 2021-02-08 15:29:36 +01:00
Frédéric FRANCE
e0b2e26da6 fix html 2021-02-07 19:05:10 +01:00
Laurent Destailleur
4efdbc71e0 Fix phpcs 2021-02-04 10:46:58 +01:00
Florian HENRY
ec41bf58e5 always ajax now 2021-02-04 09:48:17 +01:00
Laurent Destailleur
369a835abb Merge pull request #16151 from bb2a/mass_action_propal_nosigned 
NEW: add massActions to set a commercial proposal to status "Refused"
 2021-02-03 20:36:10 +01:00
Laurent Destailleur
47ac349f2d Update list.php 2021-02-03 20:34:57 +01:00
stickler-ci
609428bc09 Fixing style errors. 2021-02-03 10:37:15 +00:00
Anthony Berton
eb15c4d800 20200203 2021-02-03 11:29:54 +01:00
Laurent Destailleur
b24aac1e6b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
 2021-01-31 12:03:39 +01:00
Laurent Destailleur
044b4eee48 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/list.php
 2021-01-31 11:54:45 +01:00
Laurent Destailleur
244ee05a9c FIX #14290 #15900 2021-01-30 18:09:13 +01:00
Frédéric FRANCE
118c9ac990 add more infos in link 2021-01-20 21:02:01 +01:00
Frédéric FRANCE
9e5f0a8cb9 add more infos in link 2021-01-20 18:45:44 +01:00
Anthony Berton
b3dfe5d934 Update list.php 2021-01-10 21:48:49 +01:00
Anthony Berton
52c9dab72a Update list.php 2021-01-10 21:47:17 +01:00
Florian HENRY
510c619c85 space 2021-01-05 22:56:55 +01:00
Florian HENRY
b9bb48a01f better place and noadmininfo 2021-01-05 22:50:54 +01:00
Florian HENRY
939fecc611 add column payment mode terms shipping on order list 2021-01-05 20:32:29 +01:00
Florian HENRY
253349ced2 add column payment mode terms shipping on propal list 2021-01-05 20:23:45 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
lvessiller
4ddff7173f NEW include tpl for loading lang file for extra fields in list 2020-11-06 12:19:45 +01:00
Laurent Destailleur
e3542c6d4f Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights 
NEW Show category filter on lists only when user have rights to read categories
 2020-10-06 12:29:10 +02:00
Laurent Destailleur
a3da2afe7a Add option MAIN_LIST_ALLOW_PUBLIC_NOTES + MAIN_LIST_ALLOW_PRIVATE_NOTES 2020-09-30 11:58:40 +02:00
Sekan, Tobias
2bf15b3a92 Show category filter only on rights to read it 2020-09-28 10:42:49 +02:00
Tobias Sekan
a72519f353 Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-23 09:09:42 +02:00
Laurent Destailleur
6c06d2f0aa Look and feel v13 2020-09-22 15:26:29 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Laurent Destailleur
b6c6473cce Fix sql injection when forging requests with IN 2020-09-18 17:47:40 +02:00
Laurent Destailleur
4e2aff2cdc Fix sql injection when forging requests with IN 2020-09-18 17:28:02 +02:00
Tobias Sekan
b2a953ed5b Merge branch 'develop' into PreselectThirpartyOnNewFromList 2020-09-18 12:21:41 +02:00
Sekan, Tobias
ae8c302c19 merge variable declaration 2020-09-18 10:52:17 +02:00
Sekan, Tobias
dc4250aed7 Make button visiblity identical on most lists 2020-09-18 10:46:23 +02:00
Sekan, Tobias
d1f70a37df Preselect thirparty on new from list (part 1) 2020-09-18 07:56:13 +02:00
Laurent Destailleur
bfbb217607 Fix GETPOST on 'action' 2020-09-16 19:39:50 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00
Laurent Destailleur
5a471d38c2 Merge pull request #14611 from atm-adrien/NEW_propal_massAction_validate_sign 
New : add massActions "Validate" and "Sign"
 2020-09-07 12:13:29 +02:00
Laurent Destailleur
570c72f6c9 Update list.php 2020-09-07 12:12:28 +02:00
Adrien Raze
c8c6be2038 Retours PR 2020-09-07 10:50:01 +02:00
stickler-ci
43590587e5 Fixing style errors. 2020-09-03 12:30:04 +00:00
Adrien Raze
bcd9a0b29f Retours PR 2020-09-03 14:25:17 +02:00