Commit Graph

279 Commits

Author SHA1 Message Date
Marcos García de La Fuente
b4c84fac9d NEW: [ task #977 ] New option to manage product unit
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
2015-03-01 12:42:38 +01:00
Laurent Destailleur
ef14e4e7ed Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.product.class.php
2015-02-28 03:11:15 +01:00
Laurent Destailleur
4bde7e9f51 Fix: Missing error management 2015-02-26 14:25:30 +01:00
Laurent Destailleur
a8c6417604 Merge remote-tracking branch 'origin/3.7' into develop 2014-12-15 10:33:14 +01:00
Laurent Destailleur
8e6d30589d Fixed: Size too low 2014-12-14 20:51:28 +01:00
Laurent Destailleur
a9338a0f9f Fix: Maxi debug of module productbatch.
Conflicts:
	htdocs/core/class/conf.class.php
	htdocs/langs/en_US/productbatch.lang
2014-12-05 16:04:37 +01:00
Laurent Destailleur
5457d3116a Fix: Maxi debug of module productbatch. 2014-12-05 16:01:01 +01:00
Laurent Destailleur
f884f16564 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/admin/boxes.php
	htdocs/comm/action/card.php
	htdocs/core/class/html.formfile.class.php
2014-12-03 12:54:42 +01:00
Laurent Destailleur
7afe9de1c0 Start to debug batch/serial module 2014-12-03 00:42:14 +01:00
Laurent Destailleur
bde5a5d307 Fix: Missing translation of batch-serial prouct module 2014-12-03 00:11:31 +01:00
Frédéric FRANCE
467274b79b Update card.php 2014-11-30 21:57:10 +01:00
Laurent Destailleur
d9cb9c1585 Merge pull request #2102 from aspangaro/develop-center
Task 1603 - Remove <center> deprecated HTML5 tags
2014-11-27 23:58:44 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Laurent Destailleur
bc1d88d324 Fixed: The visualization of status with mutualized picto was lost, so i
restore old feature to keep same visual for all status and add hidden
option to switch to new.
2014-11-24 01:16:26 +01:00
Laurent Destailleur
8c440dea4a Fxied: Syntax error 2014-11-22 15:47:14 +01:00
Laurent Destailleur
ad661256c0 Fix: Bugs reported by scrutinizer 2014-11-15 16:20:03 +01:00
Laurent Destailleur
4226c27ccf Merge pull request #1965 from frederic34/patch-4
On/Off for Object (do not restrict to product)
2014-10-30 18:21:50 +01:00
Frédéric FRANCE
ba9d2c3690 Update card.php 2014-10-23 11:02:16 +02:00
Frédéric FRANCE
5e946d6466 Update card.php 2014-10-18 22:49:07 +02:00
Laurent Destailleur
4a60d57544 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/product/fiche.php
	htdocs/product/liste.php
2014-10-18 21:08:09 +02:00
Frédéric FRANCE
446e73d8b8 Update card.php 2014-10-18 18:49:47 +02:00
Frédéric FRANCE
b80b45c086 Update card.php 2014-10-18 15:55:10 +02:00
Frédéric FRANCE
98db599c69 Update card.php 2014-10-18 15:51:05 +02:00
Frédéric FRANCE
99dde1ad1e Update card.php 2014-10-12 20:44:50 +02:00
Frédéric FRANCE
633f01e5a2 Update card.php 2014-10-12 14:26:51 +02:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00
Regis Houssin
4248c7bed2 Fix: strict mode paradise 2014-10-02 09:30:31 +02:00
Laurent Destailleur
ec95aacd52 Uniformize code for error reporting after a hook. 2014-09-28 03:41:32 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00