Commit Graph

502 Commits

Author SHA1 Message Date
Alexis Algoud
34948ef2d6 Add somes dol_escape_htmltag on product cards inputs 2014-04-23 14:53:23 +02:00
Laurent Destailleur
266b413139 Fix: colspan for extrafields 2014-02-12 00:23:15 +01:00
Laurent Destailleur
358175b357 Merge remote-tracking branch 'origin/3.4' into develop 2013-11-20 23:48:06 +01:00
Laurent Destailleur
35596acf40 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	htdocs/product/fiche.php
2013-11-20 23:46:33 +01:00
Christophe Battarel
e654dac578 [Task 1144 ] Fix wrong max-length of produt ref 2013-11-20 10:33:06 +01:00
Laurent Destailleur
0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	ChangeLog
	htdocs/adherents/admin/adherent.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/document.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/facture/list.php
	htdocs/cron/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/commande/document.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cron.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/categories.lang
	htdocs/langs/nl_NL/commercial.lang
	htdocs/langs/nl_NL/companies.lang
	htdocs/langs/nl_NL/dict.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/margins.lang
	htdocs/langs/nl_NL/products.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/rib.php
2013-11-19 21:08:02 +01:00
Laurent Destailleur
4b26d8441b Fix: Entry lost 2013-11-09 12:52:06 +01:00
Laurent Destailleur
f67537799b Fix: Wrong usage of new preoutput confirm box 2013-10-26 18:46:07 +02:00
Laurent Destailleur
3050facb96 Fix: [ bug #1070 ] Accountancy code not displayed just after set
Conflicts:
	htdocs/product/fiche.php
2013-10-23 18:29:34 +02:00
Laurent Destailleur
a7ef6e5d70 Fix: [ bug #1070 ] Accountancy code not displayed just after set 2013-10-23 16:24:31 +02:00
Laurent Destailleur
1f6d0ab3ef Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/product/class/product.class.php
2013-08-27 09:36:54 +02:00
Florian Henry
2dce07590c Fix: If only service module is activated, it's impossible to delete
service
2013-08-26 14:39:35 +02:00
Cédric Salvador
6927274d2a copyright 2013-07-29 12:31:05 +02:00
Cédric Salvador
e36613f0f0 added the desired stock field to the create/edit product UI 2013-07-29 12:31:04 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Laurent Destailleur
a240dba290 Fix: Translation of text 2013-07-18 19:01:19 +02:00
Laurent Destailleur
27a435994a Qual: Some methods object->addline used a first parameter that was
object->id, some not. Of course this was not a good pratice, since
object->id is already known so no need to provide it as parameter.
All methods addline in this case were modified to match good
pratice and be uniformed with others.
2013-07-10 17:29:54 +02:00
Laurent Destailleur
499440be16 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-14 01:29:43 +02:00
Laurent Destailleur
d9f5151c39 Fix: Bad default value for finished property 2013-06-13 15:53:17 +02:00
Laurent Destailleur
febe74ad17 Merge pull request #1038 from marcosgdf/clone-composition
Clone composition
2013-06-12 13:26:40 -07:00
Marcos García
13bcb5daaa Merge branch 'develop' into clone-composition
Conflicts:
	ChangeLog
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
2013-06-12 16:39:23 +02:00
Laurent Destailleur
4ba24ed8d7 Fix: Missing empty value 2013-06-11 12:58:52 +02:00
Marcos García
e727100cf0 New: Clone product/service composition 2013-06-10 00:11:25 +02:00
Marcos García
000de9530d Fixed wrong translation key and and improved es_ES translations 2013-06-08 20:15:48 +02:00
Marcos García
c12da33dcd Fixed empty table when few modules are activated in product card view 2013-06-02 00:37:33 +02:00
Laurent Destailleur
e29f533b7a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/comm/propal/class/propal.class.php
2013-04-27 15:15:31 +02:00
Laurent Destailleur
52952c6fce Uniformize code for liste_array
Fix visibility of elements into product page (manage external users)
2013-04-27 15:08:35 +02:00
fhenry
a06581771c Reveiw extrafield for womplaiance with wiki
http://wiki.dolibarr.org/index.php/Extrafields
2013-04-26 10:29:14 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
fhenry
75194ddb57 Ifo user visibility and maxlength product label regarding db column size 2013-04-20 07:05:31 +02:00
Laurent Destailleur
af6f075b5c Qual: Better error management.
Qual: Uniformize code for canvas
2013-04-09 23:56:52 +02:00
Laurent Destailleur
76910d4159 Look: Start to use div to render actions buttons 2013-04-03 18:37:54 +02:00
jfefe
7ca7c552c0 Use new function to show extrafields on products 2013-04-01 18:59:41 +02:00
jfefe
3fe1b26136 New method to CommonObject to display extrafields data output
Try for product
2013-03-30 17:43:21 +01:00
jfefe
bd4e62a5e7 Implement extrafields : calendar on date type and new separator type 2013-03-30 16:58:49 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we
can move it during init of environment and use it globally.
2013-01-25 19:12:54 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
92723bd6fe Fix: broken features 2013-01-15 11:41:12 +01:00
Regis Houssin
8a6bc63127 Fix: uniformize code 2013-01-15 11:23:24 +01:00
Regis Houssin
787d3bd6a9 Fix: use event method 2013-01-15 11:00:32 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
simnandez
af304638c8 Fix: Add to areas not working if we navigate with shownavref 2012-12-01 15:47:16 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
commits !
2012-12-01 15:45:05 +01:00
simnandez
dbf1a727be Fix: Add to areas not working if we navigate with shownavref 2012-11-30 16:20:01 +01:00
Laurent Destailleur
cbff238cbd New: Support property "required" for extra fields. 2012-10-25 16:23:58 +02:00
Laurent Destailleur
a821d6cafe Fix: We use dolibarr_details as type of DolEditor here, because we
must not accept images as description is included into PDF and not
accepted by TCPDF.
2012-10-03 14:52:01 +02:00
Laurent Destailleur
1d9e77a53d Fix: We use dolibarr_details as type of DolEditor here, because we must
not accept images as description is included into PDF and not accepted
by TCPDF.
2012-10-03 14:49:51 +02:00
Laurent Destailleur
079ea61582 Fix: W3C 2012-10-02 00:36:23 +02:00