Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,034 Commits 36 Branches 189 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

7133 Commits

Author SHA1 Message Date
fappels
bbbc768fa7 Change filter parameter to string with comma seperated values 
Change warehousefilter from int to string with comma seperated values
for selectWarehouses and select_produits form functions.
 2016-12-06 20:07:19 +01:00
Laurent Destailleur
017e384f16 FIX Preselected value for extrafield link was not correctly set 2016-12-06 13:10:44 +01:00
fappels
c911f906c8 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status 2016-12-05 11:36:20 +01:00
Laurent Destailleur
788cbf9a01 Complete work on dol_banner on contracts 2016-12-04 13:30:17 +01:00
fappels
af5eb00933 Ignore filtering if service 2016-12-02 12:18:36 +01:00
fappels
b21fd14a11 Ignore Service, only filter warehouse if parameter set 2016-12-02 12:17:33 +01:00
fappels
2d4807190e Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop-work-on-warehouse-status 2016-11-30 13:03:24 +01:00
fappels
49442c0b7f Add filter on warehouse status to object line product list 2016-11-30 13:03:17 +01:00
Laurent Destailleur
874bb488da Fix bad comment 2016-11-29 23:42:56 +01:00
Laurent Destailleur
bd8f923cee Several fixes in filter on lists 2016-11-29 22:52:16 +01:00
gauthier
9a1309256d Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received 2016-11-28 17:13:09 +01:00
Laurent Destailleur
5e5ce0043e Debug module ECM. 2016-11-28 12:03:33 +01:00
Marcos García de La Fuente
cf0ee36150 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-11-27 18:10:01 +01:00
Laurent Destailleur
e4a8342aef Fix div-table-form balance on all lists (solve responsive design) 2016-11-27 11:41:10 +01:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
gauthier
c433829d27 NEW : interface 2016-11-25 11:04:42 +01:00
Laurent Destailleur
60b1591f0e Fix the notes must not be into the tooltip of ref. 2016-11-23 20:30:43 +01:00
Laurent Destailleur
2043c279b0 Merge remote-tracking branch 'origin/4.0' into develop 2016-11-20 15:47:40 +01:00
Laurent Destailleur
cb99113ab0 Css 2016-11-20 15:47:14 +01:00
Laurent Destailleur
e6894eda0e Better responsive 2016-11-20 10:58:28 +01:00
Laurent Destailleur
b538f13efb FIX Module gravatar was not triggered on thirdparty and contact card 2016-11-19 19:43:55 +01:00
Laurent Destailleur
e9b78db1ac Several bug fixes: 
missing import_key field, ref generator parameter must be task not
project, import must use css, serious database integrity problem
accepting duplicate tasks.
 2016-11-19 02:16:12 +01:00
Laurent Destailleur
9b88ae145b Fix mass action when using no javascript 2016-11-17 19:04:10 +01:00
florian HENRY
afd17feffe Merge remote-tracking branch 'origin/develop' into franck_develop 2016-11-16 09:38:50 +01:00
Laurent Destailleur
5539415354 FIX Remove hard coded value '1' for default payment term id. Use quick 
hack by adding hidden constant to avoid this.
 2016-11-15 10:43:03 +01:00
moreauf
081be37787 NEW: Add project and Hook to Loan 
BUG: Correct discard_closed parametters management in project
 2016-11-14 19:25:50 +01:00
Laurent Destailleur
381b77850c Fix do not show cloning of virtual product if option is off 2016-11-14 02:08:41 +01:00
Laurent Destailleur
04063a62a8 Better responsive 2016-11-12 15:18:38 +01:00
Laurent Destailleur
4bcc7dc8a0 CLOSE #4368 #4369 Add hook completeTabsHead for rewrite heads tabs menu 2016-11-12 14:36:52 +01:00
Laurent Destailleur
b1bd9e4930 Responsive design 2016-11-11 23:17:37 +01:00
Laurent Destailleur
cd9f1db229 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/fiche-rec.php
 2016-11-11 15:12:30 +01:00
Laurent Destailleur
e4617ec76c Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/core/filemanagerdol/connectors/php/config.php
	htdocs/viewimage.php
 2016-11-11 15:03:05 +01:00
Laurent Destailleur
360d697fc3 Add missing field to store result of email sending 2016-11-11 13:45:18 +01:00
Laurent Destailleur
b20c4bdfe4 Responsive design 2016-11-11 12:55:03 +01:00
Laurent Destailleur
ab269bd7a6 Better responsive 2016-11-11 01:15:41 +01:00
Laurent Destailleur
fe9c880984 NEW Add missing unique key on table llx_links 2016-11-10 14:24:29 +01:00
Laurent Destailleur
eaa2125373 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/card.php
	htdocs/projet/class/project.class.php
	htdocs/projet/list.php
 2016-11-10 11:40:39 +01:00
Laurent Destailleur
cc64994f30 Better responsive design 2016-11-10 11:33:25 +01:00
Laurent Destailleur
e30622cbd8 FIX Bcc must not appears to recipient when using SMTPs lib 2016-11-09 00:10:02 +01:00
Laurent Destailleur
d1446bb7ef NEW Show subtotal into list of linked elements 2016-11-08 19:19:30 +01:00
Laurent Destailleur
3346fb1c75 Fix can change type from url to other string 2016-11-08 17:30:48 +01:00
Laurent Destailleur
fcca3d6be1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-11-08 17:21:41 +01:00
Laurent Destailleur
6d70d39bbd NEW Add type "url" as possible extrafield. 2016-11-08 17:21:26 +01:00
Laurent Destailleur
a28e2a7fb6 Merge pull request #5863 from benlo06/fr_total_tva 
New: Permit to print TotalTTC price in objectline_view
 2016-11-08 14:46:16 +01:00
Laurent Destailleur
9bff6f966b NEW Can add event from the card listing events 2016-11-08 14:08:48 +01:00
Laurent Destailleur
7a94cfc994 NEW Better filtering of automatic/manually inserted events. 2016-11-08 13:03:20 +01:00
Laurent Destailleur
341e014a3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/document.php
 2016-11-08 11:36:31 +01:00
Laurent Destailleur
b4c20f1b1a Fix regression in creation of invoice 
Uniformize code
 2016-11-08 11:23:40 +01:00
Laurent Destailleur
9b64fbaa98 Fix having the css of extrafield on td is not enough to detect it. We 
must have it on tr too.
 2016-11-06 16:26:18 +01:00
Marcos García de La Fuente
286095f5cd Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/core/tpl/objectline_create.tpl.php
#	htdocs/fourn/facture/card.php
#	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-11-06 15:01:40 +01:00