lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,970 Commits 43 Branches 150 Tags 886 MiB
94a9d0159d
Commit Graph

44970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aspangaro
94a9d0159d Align module with 3.7 & contrary 2015-01-25 15:24:16 +01:00
aspangaro
ae11ab12f6 FIXED Accounting module - Align core & module 3.6 2015-01-25 06:54:17 +01:00
Laurent Destailleur
b7328caa9a Fixed: Bad date for supplier orders 2015-01-22 20:40:53 +01:00
Laurent Destailleur
8267cec5a3 Fix: select if field is null 2015-01-22 20:10:25 +01:00
Laurent Destailleur
0f7238937a Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/fourn/commande/fiche.php
 2015-01-22 18:55:26 +01:00
Laurent Destailleur
639d582a44 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-22 18:44:21 +01:00
Laurent Destailleur
36c083e9db Fixed: Refresh was doing update 2015-01-22 18:44:02 +01:00
Laurent Destailleur
e31decb3cf Merge pull request #2271 from aspangaro/3.7 
Correct link
 2015-01-22 13:57:30 +01:00
Laurent Destailleur
4bb86717cf Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-22 12:30:18 +01:00
Laurent Destailleur
31be2563c2 Fixed: Allow external module a chance to fix regression. 2015-01-22 12:29:55 +01:00
aspangaro
6f3d9200bf Correct link 2015-01-22 07:15:14 +01:00
Laurent Destailleur
3af67b414e Merge pull request #2267 from tiaris/3.6 
add left joins on llx_c_actioncomm
 2015-01-21 00:00:00 +01:00
jean
b809f0aeb8 Merge remote-tracking branch 'origin/3.6' into 3.6 2015-01-20 17:31:17 +01:00
jean
5ec0b32ab0 add left joins on llx_c_actiocomm 2015-01-20 17:26:32 +01:00
Laurent Destailleur
8d0c8b888d Merge pull request #2263 from frederic34/patch-1 
Use account defined in invoice for pdf doc
 2015-01-19 15:31:26 +01:00
Laurent Destailleur
e14684c417 Merge pull request #2259 from marcosgdf/misc-fixes 
misc-fixes
 2015-01-19 15:28:28 +01:00
Frédéric FRANCE
69bb4b7b0b Use account defined in invoice for pdf doc 2015-01-18 23:00:26 +01:00
Laurent Destailleur
1dd76e2ec0 Avoid request if possible 2015-01-18 19:15:23 +01:00
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
 2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
55b8c28100 Corrected weird typo 2015-01-18 16:28:42 +01:00
Marcos García de La Fuente
0b18ce5fc4 PHPDoc + missing return statements 2015-01-18 16:16:46 +01:00
Laurent Destailleur
08214999a7 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-01-18 15:21:38 +01:00
Laurent Destailleur
959fe14856 Merge pull request #2256 from marcosgdf/bug-1735 
Fix: [ bug #1735 ] Rights to delete expense notes no longer there - cannot delete expense notes
 2015-01-18 15:14:23 +01:00
Laurent Destailleur
5ed5a729d5 Merge branch 'marcosgdf-bug-1784' into 3.6 2015-01-18 15:13:38 +01:00
Laurent Destailleur
7b7b8f376f Merge branch 'bug-1784' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1784

Conflicts:
	ChangeLog
 2015-01-18 15:13:26 +01:00
Laurent Destailleur
a696ad62c3 Merge branch 'marcosgdf-bug-1717' into 3.6 2015-01-18 15:12:30 +01:00
Laurent Destailleur
ff65035aee Merge branch 'bug-1717' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1717

Conflicts:
	ChangeLog
 2015-01-18 15:12:00 +01:00
Laurent Destailleur
5ec7b10dc7 Merge branch 'marcosgdf-bug-1783' into 3.6 2015-01-18 15:10:47 +01:00
Laurent Destailleur
d1e2ab6f56 Merge branch 'bug-1783' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1783

Conflicts:
	ChangeLog
 2015-01-18 15:10:30 +01:00
Laurent Destailleur
a0de75c727 Merge branch 'marcosgdf-bug-1796' into 3.6 2015-01-18 15:09:18 +01:00
Laurent Destailleur
7c5927ef93 Merge branch 'bug-1796' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1796

Conflicts:
	ChangeLog
 2015-01-18 15:08:49 +01:00
Laurent Destailleur
abf961707d Merge branch 'marcosgdf-bug-1787' into 3.6 2015-01-18 15:07:15 +01:00
Laurent Destailleur
b3e216b8f1 Merge branch 'bug-1787' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1787

Conflicts:
	ChangeLog
	htdocs/comm/propal.php
 2015-01-18 15:06:54 +01:00
Laurent Destailleur
ccaab5e183 Merge branch 'marcosgdf-bug-1803' into 3.6 2015-01-18 15:01:34 +01:00
Laurent Destailleur
c35de1aa06 Merge branch 'bug-1803' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1803

Conflicts:
	ChangeLog
 2015-01-18 15:01:18 +01:00
Laurent Destailleur
839f73d568 Update doc 2015-01-18 14:57:25 +01:00
Laurent Destailleur
c1f3d66686 Merge branch 'marcosgdf-bug-1804' into 3.6 2015-01-18 14:03:04 +01:00
Laurent Destailleur
cef48d1275 Merge branch 'bug-1804' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1804

Conflicts:
	ChangeLog
 2015-01-18 14:02:52 +01:00
Laurent Destailleur
cf3a8f5a71 Merge pull request #2245 from KreizIT/fix_defaultE37 
Fix Creating default object from empty on supplier order confirmation
 2015-01-18 14:01:57 +01:00
Laurent Destailleur
0513ce25e5 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 
Conflicts:
	ChangeLog
 2015-01-18 13:51:45 +01:00
Laurent Destailleur
056c0b0ca1 Merge branch 'marcosgdf-bug-1788' into 3.6 2015-01-18 13:49:23 +01:00
Laurent Destailleur
a51ea308f5 Merge branch 'marcosgdf-bug-1762' into 3.5 2015-01-18 13:46:15 +01:00
Laurent Destailleur
8644407c0a Merge pull request #2230 from defrance69/patch-42 
Update card.php
 2015-01-18 13:44:35 +01:00
Laurent Destailleur
05f08a7181 Merge branch 'bug-1762' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1762

Conflicts:
	ChangeLog
 2015-01-18 13:43:57 +01:00
frederic34
d45750d914 Ignore content of directory custom 
Conflicts:
	htdocs/custom/.gitignore
 2015-01-18 13:07:39 +01:00
Laurent Destailleur
b1f889e1d1 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-01-18 12:46:23 +01:00
Laurent Destailleur
896b924380 git push origin 3.6Merge branch 'marcosgdf-bug-1785' into 3.6 2015-01-18 12:45:29 +01:00
Laurent Destailleur
2f4352c759 Merge branch 'bug-1785' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1785

Conflicts:
	ChangeLog
 2015-01-18 12:45:05 +01:00
Laurent Destailleur
19dbf7e2c6 Merge pull request #2185 from marcosgdf/bug-1765 
Fix: [ bug #1765 ] Unable to create a contract
 2015-01-18 12:39:25 +01:00
Laurent Destailleur
1a552cf643 git push origin 3.6Merge branch 'marcosgdf-bug-1802' into 3.6 2015-01-18 12:37:44 +01:00