2
0
forked from Wavyzz/dolibarr
Commit Graph

15 Commits

Author SHA1 Message Date
Laurent Destailleur
01aad8516d Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/adherents/list.php
	htdocs/compta/dons/card.php
	htdocs/compta/dons/class/don.class.php
	htdocs/contact/list.php
	htdocs/contrat/list.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/security.lib.php
	htdocs/main.inc.php
	htdocs/product/stock/massstockmove.php
	htdocs/public/test/test_arrays.php
	htdocs/public/test/test_forms.php
	htdocs/societe/societe.php
2015-05-31 03:30:38 +02:00
Laurent Destailleur
11d4a945b0 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/adherents/liste.php
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/contact/list.php
	htdocs/contrat/liste.php
	htdocs/product/liste.php
2015-05-25 18:08:23 +02:00
jfefe
25812f0071 Add picto for commercial pages titles 2015-04-18 23:17:44 +02:00
cla
2ef654045b ADD: new fields and relative filters in contracts list page 2015-02-23 20:26:34 +01:00
Frédéric FRANCE
523afc3943 Put form outside table 2014-11-28 00:57:40 +01:00
Frédéric FRANCE
d57344a2e7 Update /contrat/list.php 2014-11-23 17:43:48 +01:00
Frédéric FRANCE
7442b1a6b1 Update /contrat/list.php 2014-11-23 09:34:56 +01:00
Laurent Destailleur
43f3e28fd6 Fixed: [ bug #1645 ] Can't list contracts 2014-11-22 15:12:36 +01:00
aspangaro
111b2e83f1 Contracts list 2014-11-03 06:05:51 +01:00
Frédéric FRANCE
0775744b37 No thirdparty name in contract list 2014-10-27 18:27:46 +01:00
Laurent Destailleur
11d1be882c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/contrat/list.php
2014-10-04 17:32:01 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name"
everywhere.
2014-10-04 17:20:17 +02:00
Florian HENRY
14ca936cfc set ref_supplier for contract field 2014-09-24 10:21:26 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
aspangaro
b22aef3521 Qual: Renamed all files & links "liste.php" into "list.php" 2014-09-18 20:33:37 +02:00