lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f7ab53be8e
dolibarr/htdocs/comm
History
Laurent Destailleur 100fa1067e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/bank/virement.php
	htdocs/compta/facture/impayees.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/modules/modProjet.class.php
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
	htdocs/langs/en_GB/admin.lang
	htdocs/langs/es_AR/orders.lang
	htdocs/langs/es_AR/trips.lang
	htdocs/langs/es_CO/admin.lang
	htdocs/langs/es_CO/orders.lang
	htdocs/langs/es_CO/trips.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/langs/pl_PL/interventions.lang
	htdocs/langs/pt_BR/trips.lang
	htdocs/langs/ro_RO/productbatch.lang
	htdocs/langs/ro_RO/trips.lang
	htdocs/main.inc.php
	htdocs/projet/element.php
2015-04-22 17:57:57 +02:00
..
action NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
admin Change generic and setup image title 2015-04-18 23:13:48 +02:00
askpricesupplier fix bug #2652 2015-04-18 22:59:20 +02:00
mailing Merge remote-tracking branch 'origin/3.7' into develop 2015-04-22 17:57:57 +02:00
propal First clean of code after devcamp 2015-04-21 15:49:58 +02:00
prospect Add picto for commercial pages titles 2015-04-18 23:17:44 +02:00
address.php Replace <center> tags 2014-11-25 20:13:43 +01:00
card.php Alert when oustanding amount excedeed 2015-04-18 19:08:44 +02:00
contact.php Uniformize code: property "nom" for thirdparty is aliased into "name" 2014-10-04 17:20:17 +02:00
index.php Fixed wrong field 2015-04-19 00:44:39 +02:00
list.php Add picto for commercial pages titles 2015-04-18 23:17:44 +02:00
multiprix.php Removed closing php tag 2014-05-03 18:18:44 +02:00
propal.php First clean of code after devcamp 2015-04-21 15:49:58 +02:00
recap-client.php Uniformize code: property "nom" for thirdparty is aliased into "name" 2014-10-04 17:20:17 +02:00
remise.php Replace <center> tags 2014-11-25 20:13:43 +01:00
remx.php Merge remote-tracking branch 'origin/3.7' into develop 2015-02-19 00:01:26 +01:00