lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,233 Commits 43 Branches 150 Tags 886 MiB
35dfaf4dd1
Commit Graph

46233 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
4639ce3364 Merge branch 'bug-1802' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1802

Conflicts:
	ChangeLog
 2015-01-18 12:37:16 +01:00
Laurent Destailleur
83675daa8a Merge pull request #2255 from frederic34/patch-1 
Correct travis error
 2015-01-18 12:33:51 +01:00
Laurent Destailleur
eaacb3c33b Merge pull request #2257 from IonAgorria/per-entity-smtp 
Store per entity SMTP configuration
 2015-01-18 12:33:08 +01:00
Laurent Destailleur
ef802d9c39 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
 2015-01-18 12:31:01 +01:00
Laurent Destailleur
6a294eb02a Fixed: Better fix for backward compatibility 2015-01-18 12:29:55 +01:00
Florian HENRY
c8db8f001b fix travis 2015-01-18 12:06:05 +01:00
Florian HENRY
b407716175 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-18 11:57:32 +01:00
Laurent Destailleur
012c571a6c Fixed: Backward compatibility 2015-01-18 11:50:53 +01:00
Laurent Destailleur
b53b8d2e45 Fixed: Backward compatibility 2015-01-18 11:48:52 +01:00
Frédéric FRANCE
f3a3136452 Update html.form.class.php 2015-01-18 11:38:45 +01:00
Laurent Destailleur
1681e3b03d Fix: Not allowed types 
(http://wiki.dolibarr.org/index.php/Langages_et_normes#Structure_des_tables_et_champs)
 2015-01-18 11:36:15 +01:00
Laurent Destailleur
2396f03093 Add PHP 5.6 into travis tests 2015-01-18 11:21:43 +01:00
Marcos García de La Fuente
be3527abd1 Fixed some errors of Bookkeeping class 2015-01-18 03:23:00 +01:00
Ion Agorria
48c6897f75 Store per entity SMTP configuration 2015-01-18 03:20:35 +01:00
Marcos García de La Fuente
71e5cf07c6 Fix: [ bug #1735 ] Rights to delete expense notes no longer there - cannot delete expense notes 2015-01-18 03:12:46 +01:00
Marcos García de La Fuente
17b14eed88 Updated bug title 2015-01-18 02:55:59 +01:00
Frédéric FRANCE
6237f68e74 Update facture.class.php 2015-01-18 01:07:32 +01:00
Frédéric FRANCE
f763f23614 Update facture.class.php 2015-01-18 00:57:03 +01:00
Marcos García de La Fuente
78905c6af1 Fix: [ bug #1784 ] « Message page de connexion » n'apparaît pas 2015-01-17 20:29:51 +01:00
frederic34
32d7dec87d Merge remote branch 'upstream/develop' into custom 2015-01-17 20:18:07 +01:00
Marcos García de La Fuente
003aa5ee44 Fix: [ bug #1717 ] Sorting unpaid invoices by amount received brings due amount 2015-01-17 19:41:31 +01:00
Marcos García de La Fuente
dacec491ff Fix: [ bug #1783 ] SQL error when enabling 3rd party module with PostgreSQL and MySQL strict mode ON 2015-01-17 19:37:49 +01:00
Marcos García de La Fuente
7f59cf9194 Fix: [ bug #1787 ] Incorrect behaviour of doActions hook 2015-01-17 19:28:27 +01:00
Laurent Destailleur
1664b89cef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-17 19:26:19 +01:00
Laurent Destailleur
ded86d4031 Merge branch 'GPCsolutions-review' into develop 2015-01-17 19:25:56 +01:00
Marcos García de La Fuente
cc9197e4c8 Fixed problem with Fichinter::getNextNumRef 2015-01-17 19:13:38 +01:00
Marcos García de La Fuente
103a433bdf Fix: [ bug #1796 ] Unable to use numeration modules from an external module 2015-01-17 19:00:44 +01:00
Marcos García de La Fuente
41e01a22a3 Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code 2015-01-17 18:58:05 +01:00
Marcos García de La Fuente
ed839114ab Fixed loading of external numeration modules in FactureFournisseur and Propal 2015-01-17 18:42:19 +01:00
Marcos García de La Fuente
068045f6a0 Fix: [ bug #1803 ] AJAX company contact input is not aligned 2015-01-17 18:23:20 +01:00
Marcos García de La Fuente
a64084308d Fix: [ bug #1804 ] SQL error when sending email without addresee 2015-01-17 18:12:43 +01:00
Laurent Destailleur
06eda34b56 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-17 16:40:53 +01:00
Laurent Destailleur
9876b30387 Need more info to find bugs 2015-01-17 16:22:37 +01:00
Laurent Destailleur
007f18bcf7 Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into 
GPCsolutions-review

Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/comm/action/peruser.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/report.lib.php
 2015-01-17 15:11:12 +01:00
Laurent Destailleur
eeeb6de8d9 Merge pull request #2020 from GPCsolutions/situationsinvoices 
Situations invoices support
 2015-01-17 14:44:05 +01:00
Laurent Destailleur
30abacd0a6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-17 14:42:42 +01:00
Laurent Destailleur
da269a15a3 Merge branch 'FHenry-develop_bank_extrafields' into develop 2015-01-17 14:42:23 +01:00
Laurent Destailleur
87a59ef527 Merge branch 'develop_bank_extrafields' of 
https://github.com/FHenry/dolibarr into FHenry-develop_bank_extrafields

Conflicts:
	htdocs/admin/bank.php
 2015-01-17 14:42:04 +01:00
Laurent Destailleur
8cd46e4830 Introduce option MAIN_HTML_TITLE to start to control format of html 
title content.
 2015-01-17 14:34:16 +01:00
Juanjo Menent
daf3df158d Merge pull request #2246 from frederic34/patch-1 
Typo
 2015-01-17 01:40:10 +01:00
Frédéric FRANCE
a7d263c14e Typo 2015-01-16 23:34:10 +01:00
frederic34
52a1e8a0f3 Merge remote branch 'upstream/develop' into custom 
Conflicts:
	htdocs/custom/.gitignore
 2015-01-16 23:09:43 +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
Laurent Destailleur
6a900598a3 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-16 15:13:48 +01:00
Laurent Destailleur
41890d0a0b Fixed: Translation of module name and desc was not used for external 
modules.
 2015-01-16 14:38:00 +01:00
Laurent Destailleur
d1a0187f82 Merge pull request #2236 from marcosgdf/translations 
Corrected translation typos
 2015-01-16 12:10:32 +01:00
Laurent Destailleur
c5df4fd9b8 Merge pull request #2240 from genezys/develop 
Add support for configurable first day of week
 2015-01-16 12:09:21 +01:00