Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
47,328 Commits 36 Branches 189 Tags
b0baed83fc94de4807d73e9b7c9b4bec3d4c818f
Commit Graph

474 Commits

Author SHA1 Message Date
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
Maxime Kohlhaas
54a68116e4 Fix : prevelement with SEPA 2015-04-19 01:55:35 +02:00
Marcos García de La Fuente
e2e6049c7f Copyright 2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
Scrutinizer Auto-Fixer
4da737424e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-04-06 10:25:30 +00:00
aspangaro
414d4c6432 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-22 18:08:12 +01:00
aspangaro
d69f066735 QUAL: Traduce terms + remove <center> 2015-03-15 14:04:07 +01:00
Juanjo Menent
a2adeb2807 Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line 
159
 2015-03-14 10:17:41 +01:00
Juanjo Menent
851cae80a2 Fix: [ bug #1836 ] Required parameter missing in Rejetprelevement line 
159
 2015-03-14 10:16:50 +01:00
aspangaro
3897e65425 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-03-11 05:28:59 +01:00
Laurent Destailleur
a5645b626c Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/projet/element.php
 2015-03-11 03:55:46 +01:00
Laurent Destailleur
d847f9581e Fix generation of RUM number. Show it on card to help debug. 2015-03-10 11:31:23 +01:00
Laurent Destailleur
fa2e57eaa3 pcpcs 2015-03-04 01:10:23 +01:00
aspangaro
c119ce382e Merge remote-tracking branch 'Upstream/develop' into develop-loan 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-02 21:05:38 +01:00
Laurent Destailleur
f81cb81e67 Merge pull request #2405 from frederic34/patch-5 
phpcs
 2015-03-02 00:31:50 +01:00
Laurent Destailleur
2795d27cc9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/fourn/commande/card.php
	htdocs/langs/en_US/admin.lang
	htdocs/projet/index.php
 2015-03-01 16:13:22 +01:00
Laurent Destailleur
9b0dce2e34 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/lib/agenda.lib.php
 2015-03-01 13:58:56 +01:00
Frédéric FRANCE
eb2cc110fc phpcs 2015-02-28 10:49:14 +01:00
Juanjo Menent
856c8f24de Fix: Bad SEPA xml file creation 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2015-02-27 18:14:45 +01:00
Juanjo Menent
88d1d203d8 Fix: Bad SEPA xml file creation 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2015-02-27 18:13:24 +01:00
Juanjo Menent
7ca8fdb20c PHP norms 2015-02-27 17:58:19 +01:00
Juanjo Menent
bfe9bf7a47 Fix: Bad SEPA xml file creation 2015-02-27 17:55:15 +01:00
aspangaro
4803a1fb89 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-25 06:59:27 +01:00
Laurent Destailleur
6d3834b3b9 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/index.php
	htdocs/projet/class/project.class.php
	test/phpunit/BankAccountTest.php
 2015-02-23 14:59:24 +01:00
aspangaro
63099727d0 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2015-02-21 15:10:35 +01:00
Laurent Destailleur
9e078b32d2 Fixes the way the RUM number is generated. Start phpunit test. 2015-02-20 18:35:52 +01:00
Laurent Destailleur
49cb36461c Typo 2015-02-20 15:54:16 +01:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
 2015-02-19 00:01:26 +01:00
Marcos García de La Fuente
0d6d98b395 PHPDoc and misc fixes for several folders 2015-02-10 13:17:37 +01:00
Marcos García de La Fuente
e21681a369 PHPDoc and misc fixes for Admin 2015-02-10 10:52:48 +01:00
frederic34
f4161b457b Add dol_escape_htmltag and start to adapt boxes 2015-01-22 00:23:55 +01:00
frederic34
1b0dd671b3 Add tooltip in getNomUrl link 2015-01-20 21:40:33 +01:00
Laurent Destailleur
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
 2015-01-18 18:44:22 +01:00
Frédéric FRANCE
a7d263c14e Typo 2015-01-16 23:34:10 +01:00
Juanjo Menent
26e5efd71d Improve code create function 2015-01-16 23:09:13 +01:00
Juanjo Menent
93d3ffb06f Fix: PostgreSQL compatibilty 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2015-01-16 18:03:55 +01:00
Juanjo Menent
0d4aad4111 Fix: PostgreSQL compatibilty 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2015-01-16 17:59:58 +01:00
Juanjo Menent
fe5533d1c3 Fix: PostgreSQL compatibilty 2015-01-16 17:41:56 +01:00
Juanjo Menent
1930d0677e Fix: withdrawal create error if in the same month are deleted previus 
withdrawals.

Conflicts:
	ChangeLog
 2015-01-15 10:02:42 +01:00
Juanjo Menent
f03ffaf5a3 Fix: withdrawal create error if in the same month are deleted previus 
withdrawals.

Conflicts:
	ChangeLog
 2015-01-15 10:00:52 +01:00
Juanjo Menent
d40eab2494 Fix: withdrawal create error if in the same month are deleted previus 
withdrawals.
 2015-01-15 09:57:20 +01:00
frederic34
60661ae948 Add some "classfortooltip" 2015-01-09 00:07:54 +01:00
Laurent Destailleur
2a3bb96c34 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/ecm.lib.php
 2014-12-22 03:14:22 +01:00
Laurent Destailleur
8996953077 Fix: error reported by scrutinizer 2014-12-20 15:42:03 +01:00
Laurent Destailleur
711b033844 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/contrat/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/stock/card.php
 2014-12-14 12:35:13 +01:00
Laurent Destailleur
63f2bfed24 Fixed: Maxi debug of withdrawal module. 2014-12-09 11:19:16 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Frédéric FRANCE
8c839cc2a1 Update /compta/prelevement/list.php 2014-11-23 17:44:16 +01:00
Frédéric FRANCE
37eef59b50 Update /compta/prelevement/list.php 2014-11-23 09:50:19 +01:00
aspangaro
c256243bf7 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-16 08:41:39 +01:00