Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
72,480 Commits 36 Branches 189 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

1344 Commits

Author SHA1 Message Date
Laurent Destailleur
825a295294 FIX #8198 2018-02-15 13:28:15 +01:00
Maxime Kohlhaas
9899a02630 Display alert if order total is under order min amount 2018-01-20 20:17:56 +01:00
Laurent Destailleur
3871c694f6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-17 19:50:33 +01:00
Laurent Destailleur
bc7bd77cea Fix permission to open supplier order 2018-01-17 15:54:27 +01:00
Laurent Destailleur
af6b84ba3a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/contact/document.php
	htdocs/product/list.php
 2018-01-11 01:03:13 +01:00
florian HENRY
25390e5f73 fix : linked object (new format of linked_object atribut on 6.0) 2018-01-03 17:03:00 +01:00
Laurent Destailleur
6676178435 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/contrat/card.php
 2017-12-28 09:56:40 +01:00
Laurent Destailleur
3ac413084f Merge branch '6.0' into 6.0 2017-12-28 08:46:22 +01:00
Ferran Marcet
1c7b99d3dc Fix: Missing include for Project class 2017-12-26 12:13:35 +01:00
Laurent Destailleur
eab44f62b1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_builddoc.inc.php
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/notes.tpl.php
	htdocs/main.inc.php
	htdocs/product/inventory/tpl/inventory.tpl.php
	htdocs/societe/tpl/linesalesrepresentative.tpl.php
 2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960 FIX security vulnerability reported by ADLab of Venustech 2017-12-21 13:32:16 +01:00
Laurent Destailleur
b03d0134a7 Filter on date extrafield timestamp and datetime disabled (not possible 
yet)
 2017-12-20 18:30:41 +01:00
Laurent Destailleur
af1028576d Fix on search all (trim search + search from smartphone). 2017-12-12 11:31:30 +01:00
Laurent Destailleur
1251807f54 Fix several pb in links to projects on create page 2017-12-12 10:37:51 +01:00
Maxime Kohlhaas
8a39e2a413 Fix : no need for action button on cards, link is now available 2017-12-07 00:36:23 +01:00
fappels
cec490dff5 Fix dispatch not adapted for label to ref change for warehouse 2017-12-01 12:57:56 +01:00
Alexis ALGOUD
b2effa7cc8 fix travis 2017-11-30 11:36:35 +01:00
root
b7f26ea788 FIX add line bad price and ref 2017-11-30 11:10:01 +01:00
florian HENRY
94285ae494 factorization of extrafeild into list 2017-11-27 15:24:29 +01:00
Laurent Destailleur
9c22b5f335 Replace deprecated dol_print_graph with DolGraph 2017-11-23 20:24:05 +01:00
Laurent Destailleur
f68b2bdeca Use the confirmation when deleting from mass action everywhere. 2017-11-15 11:39:11 +01:00
Laurent Destailleur
fdcbf082fd Fix css 2017-11-12 19:39:02 +01:00
Laurent Destailleur
bf121f9b3c Work on saving supplier_ref into database lines 2017-11-12 19:29:03 +01:00
Laurent Destailleur
836f6bf3c9 Fix search filter when using extrafields 'links' 2017-11-12 12:39:23 +01:00
Laurent Destailleur
d1860b87f8 NEW Add a confirmation for all mass action 'delete' 2017-11-11 16:34:11 +01:00
Laurent Destailleur
1b28c45e2c PERF Links in getNomUrl use only one tag a instead of 2. 2017-11-02 15:19:14 +01:00
Laurent Destailleur
d569218162 Fix 'separate' extrafields must be visible by default. 
Sandardize name of list pages (must end with _list.php)
 2017-10-29 11:23:20 +01:00
Laurent Destailleur
8058712d47 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/contrat/class/contrat.class.php
	htdocs/product/list.php
 2017-10-26 17:06:11 +02:00
Laurent Destailleur
67208b111d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/facture.php
	htdocs/expedition/card.php
	htdocs/product/list.php
 2017-10-26 17:02:40 +02:00
TuxGasy
9c3805c0d5 Fix anchor after add line 2017-10-19 14:10:58 +02:00
Laurent Destailleur
7f85d73001 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contrat/card.php
	htdocs/expensereport/card.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/paiement/card.php
	htdocs/livraison/card.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/societe/rib.php
	htdocs/supplier_proposal/list.php
	htdocs/user/card.php
 2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a Fix perm to delete files 2017-10-18 17:21:30 +02:00
Scrutinizer Auto-Fixer
bd5bffa72c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-16 06:47:05 +00:00
Laurent Destailleur
4296df45af Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/projet/list.php
	htdocs/user/card.php
 2017-10-13 22:01:56 +02:00
Laurent Destailleur
7c9993ef0e Various fixes 2017-10-13 12:14:57 +02:00
Laurent Destailleur
8c5cf9ea45 Fix date output 2017-10-12 18:04:47 +02:00
Laurent Destailleur
68ec8ef313 Fix lang missing 2017-10-11 12:05:48 +02:00
Scrutinizer Auto-Fixer
328d39bc71 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2017-10-07 11:09:31 +00:00
Laurent Destailleur
f9d9642340 FIX #6981 2017-10-06 14:07:28 +02:00
Laurent Destailleur
d28188d19d FIX Generation of invoice from bulk action "Bill Orders" 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2017-10-04 14:31:52 +02:00
Laurent Destailleur
a74d6074a3 FIX Generation of invoice from bulk action "Bill Orders" 2017-10-04 14:27:10 +02:00
Laurent Destailleur
9d6498f2a4 NEW Search filters in lists are restored when using "back to list" 2017-10-03 14:50:52 +02:00
Laurent Destailleur
03c08b1de4 Merge pull request #7507 from dolibarr95/patch-20 
Line missing (error 500)
 2017-10-02 00:10:03 +02:00
Laurent Destailleur
f007f9e7e5 NEW Add new property visible dy default on lists on extrafields 2017-09-29 13:26:44 +02:00
dolibarr95
3849da4fe4 Line missing (error 500) 
Create an instance of ProductFournisseur.
 2017-09-27 09:09:38 +02:00
Laurent Destailleur
d232f8e3d5 Merge pull request #7500 from dolibarr95/patch-19 
Try to fix 7492
 2017-09-26 20:57:37 +02:00
Laurent Destailleur
7cf1a41853 Try to replace error into warning, so we can still make the order if qty too low 2017-09-26 20:57:09 +02:00
fappels
7d965f58d6 Clean code 2017-09-26 16:21:28 +02:00
dolibarr95
7b106bc642 Try to fix 7492 
check if enough quantity
 2017-09-26 14:13:11 +02:00
Laurent Destailleur
c9e9f60f8f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-09-25 19:55:52 +02:00