Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,347 Commits 36 Branches 189 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

1377 Commits

Author SHA1 Message Date
Laurent Destailleur
e59edca855 Fix Responsive design 2016-11-27 20:55:59 +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
017b18d5c6 Fix #6037 #6041 2016-11-27 16:09:16 +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
Raphaël Doursenaud
2f424d2edb FIX #5325 contract service triggers 
Pass ContratLigne objects to the triggers when updating contract
lines
 2016-11-20 13:21:43 +01:00
Laurent Destailleur
6eb16f66e0 Fix no pdf generation if pdf template not activated 2016-11-14 01:32:04 +01:00
Laurent Destailleur
c34081cf53 Fix default contract numbering module must be serpis of nothing defined 2016-11-14 01:24:36 +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
2cfcca82b4 Fix list of linked object block 2016-11-11 02:18:48 +01:00
Laurent Destailleur
c2ce5c4eeb FIX False positive on services not activated 2016-11-10 11:54:02 +01:00
Laurent Destailleur
bc6d655cfb Uniformize code 2016-11-09 16:11:02 +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
BENKE Charlie
614a0f2077 Update card.php 2016-11-05 11:05:14 +01:00
Laurent Destailleur
6338b04ac0 Remove call of a deprecated function 2016-10-24 11:27:39 +02:00
Laurent Destailleur
6aeed34d30 Merge pull request #5871 from atm-florian/dev_clonecontract 
NEW Add clone contract feature
 2016-10-15 02:21:35 +02:00
Laurent Destailleur
d27dea8320 NEW Can rename uploaded or generated files on all "documents" tabs. 2016-10-14 18:09:24 +02:00
florian HENRY
c53b33c1f0 add old copy to manage value into triggers clone 2016-10-14 08:39:29 +02:00
florian HENRY
39aebb6944 NEW : add clone contract feature 2016-10-14 07:54:44 +02:00
Laurent Destailleur
8755fa07af Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/admin_extrafields_add.tpl.php
	htdocs/main.inc.php
 2016-10-11 12:35:14 +02:00
Sergio Sanchis Climent
9024c225fd FIX: updateligne if $txlocaltax1 is null 2016-10-04 00:33:34 +02:00
Sergio Sanchis Climent
1dbb8d697e FIX: addline if $txlocaltax1 is empty 2016-10-04 00:26:39 +02:00
Laurent Destailleur
96426de416 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-10-01 19:25:35 +02:00
Laurent Destailleur
2c4a04ac8a FIX #5818 2016-10-01 19:23:44 +02:00
aspangaro
922495d72d Correct travis & typo "Execuete" 2016-09-24 07:18:38 +02:00
Laurent Destailleur
c4c7ccc226 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/societe/note.php
	htdocs/societe/rib.php
 2016-09-19 14:05:16 +02:00
Laurent Destailleur
5fb55cc9de Fix css 2016-09-18 22:00:59 +02:00
Laurent Destailleur
aa59420413 FIX #5712 #5751 2016-09-14 19:48:57 +02:00
Laurent Destailleur
0ab377440d Complete param of setValueFrom 2016-09-12 20:16:39 +02:00
Laurent Destailleur
9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contrat/list.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/card.php
	htdocs/product/stock/class/productlot.class.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 02:05:38 +02:00
Laurent Destailleur
1fbf233f95 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/expedition/list.php
	htdocs/expensereport/list.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/list.php
	htdocs/product/reassort.php
	htdocs/product/reassortlot.php
	htdocs/product/stock/list.php
	htdocs/societe/list.php
	htdocs/supplier_proposal/list.php
	htdocs/theme/eldy/style.css.php
 2016-09-12 01:50:38 +02:00
Ferran Marcet
b5db70342b Fix: Search all is lost on lists when pagination or when the columns are sorted 2016-09-09 13:58:41 +02:00
Laurent Destailleur
0debcf745a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
 2016-09-09 09:32:14 +02:00
Laurent Destailleur
c3bb4a89e4 Fix late satus on contract service line 2016-09-08 17:53:04 +02:00
Marcos García de La Fuente
05728075d6 Merge branch 'develop' into prod-attr 
# Conflicts:
#	htdocs/core/class/html.form.class.php
#	htdocs/core/tpl/objectline_create.tpl.php
#	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
#	htdocs/install/mysql/migration/4.0.0-5.0.0.sql
 2016-09-06 21:06:33 +02:00
florian HENRY
ae34ef98f6 Create order from contract 2016-09-05 09:42:34 +02:00
Laurent Destailleur
b52e2f404c NEW Can select fields/extrafields on contract list + Mass delete action. 2016-09-02 14:47:59 +02:00
Laurent Destailleur
8fd082cf16 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/hrm/hrm.php
 2016-08-31 16:16:19 +02:00
Juanjo Menent
9e6429320a Fix #5641 Dolibarr 4.0 RC2 bug when create new contract 2016-08-31 02:47:42 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
phf
7813f0be27 Fix deprecated value given to dol_print_date 2016-08-25 10:07:19 +02:00
Laurent Destailleur
1fc5715040 Fix date of contract not used 2016-08-20 00:30:09 +02:00
Laurent Destailleur
2afc567a53 Fix fiter on contract date 2016-08-17 11:58:55 +02:00
Laurent Destailleur
4d4fc87e2b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/stock/productlot_list.php
	htdocs/websites/index.php
 2016-08-09 13:26:08 +02:00
Laurent Destailleur
bcd055b378 Move button to link to, in same part of code than code to output links. 2016-08-05 15:30:28 +02:00
Laurent Destailleur
7a7e7b330f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-08-04 11:58:11 +02:00
Laurent Destailleur
7f6e2a277a NEW Link between objects can be done on both side and on all objects 2016-08-04 11:57:37 +02:00
aspangaro
da274f0ca4 Uniformize presentation on contract 2016-08-03 07:28:00 +02:00
Laurent Destailleur
f0c75388cb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/api_commande.class.php
	htdocs/compta/facture/class/api_invoice.class.php
	htdocs/product/class/api_product.class.php
	htdocs/societe/class/api_contact.class.php
	htdocs/societe/class/api_thirdparty.class.php
 2016-08-02 17:43:12 +02:00
Laurent Destailleur
86f576f8d3 Fix strict sql 2016-08-02 13:45:35 +02:00