Commit Graph

45118 Commits

Author SHA1 Message Date
aspangaro
058cf8782c Payment VAT :: Add control on field required 2014-09-03 21:47:46 +02:00
aspangaro
4e05afdd66 Payment Salaries :: Add field required & control on it 2014-09-03 21:32:31 +02:00
aspangaro
bd99f3943d Payment VAT :: Add control on field required 2014-09-03 21:31:40 +02:00
aspangaro
354aee2457 Modify eldy menu 2014-09-03 21:01:24 +02:00
aspangaro
1389f75933 Don't show journals of module comptabilite when accounting expert module is enabled 2014-09-03 20:32:38 +02:00
Laurent Destailleur
b1b69336ae New: Add proposals into referer page of thirdparty 2014-09-03 18:48:42 +02:00
Laurent Destailleur
7021f4fb01 Fix: Message show when dir is out of sync with database cache was wrong. 2014-09-03 16:09:14 +02:00
Laurent Destailleur
1eaf615426 Fix: no br after title 2014-09-03 14:32:59 +02:00
Florian HENRY
b04eae95e5 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-09-03 11:44:37 +02:00
Laurent Destailleur
be3f458754 Fix: Pb with pgsql 2014-09-03 11:30:13 +02:00
Florian HENRY
b536c8a10c Add missing image into amarok theme 2014-09-03 10:24:41 +02:00
Laurent Destailleur
be0c7ba28f Fix: Bad title 2014-09-03 09:55:06 +02:00
Laurent Destailleur
ca322942ae I remove the extend into commonobjectline to common object.
For the moment, if we need a method for line already into object, i
prefer to see method duplicated.
2014-09-03 09:49:50 +02:00
Laurent Destailleur
1375e20fe2 Fix: doxygen 2014-09-03 09:45:29 +02:00
aspangaro
4f41ee9f4c typo 2014-09-03 07:24:30 +02:00
aspangaro
9d08f4c5f5 Patch Accounting Expert module 2014-09-03 07:22:59 +02:00
aspangaro
e4f51d8f7a Merge branch 'Upstream/develop' 2014-09-02 20:47:27 +02:00
Laurent Destailleur
df70450073 Fix: Doxygen 2014-09-02 20:00:10 +02:00
Laurent Destailleur
229cbc2342 Merge pull request #1834 from Cubexed/develop
Enables the fetching and saving of start and end dates in supplier order lines.
2014-09-02 19:48:36 +02:00
Laurent Destailleur
a87314f732 Merge pull request #1854 from dsthode/develop
Contract never shown on interventions
2014-09-02 19:46:49 +02:00
Laurent Destailleur
165856656a Fix: balance with td 2014-09-02 19:45:50 +02:00
Laurent Destailleur
f7c48558e6 Fix: balance with td 2014-09-02 19:45:05 +02:00
Laurent Destailleur
80968bc087 Merge pull request #1857 from aternatik/resource-fix
Fixes for resource module
2014-09-02 19:35:06 +02:00
Laurent Destailleur
257d7c41d6 Merge pull request #1863 from FHenry/3.6
Fix: list event view lost type event filter
2014-09-02 19:34:17 +02:00
Laurent Destailleur
660557b4dd Merge pull request #1862 from FHenry/3.5
Fix: list event view lost type event filter
2014-09-02 19:34:07 +02:00
Laurent Destailleur
0254edb426 Merge pull request #1858 from ndrosis/patch-4
Can change size of Logo picture
2014-09-02 19:15:59 +02:00
Laurent Destailleur
adc96cc826 Merge pull request #1853 from aspangaro/develop-accounting
Integration of module Accounting Expert
2014-09-02 19:14:21 +02:00
Laurent Destailleur
0bc511a626 Merge pull request #1850 from braito4/patch-1
Update fiche.php
2014-09-02 19:12:09 +02:00
Laurent Destailleur
576512e339 Merge pull request #1815 from GPCsolutions/catbug
Fix categories bug
2014-09-02 19:05:05 +02:00
Laurent Destailleur
38233ca05d Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/admin/limits.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/core/ajax/ziptown.php
2014-09-02 13:46:47 +02:00
Laurent Destailleur
17dec4b924 Fix: Bad merge 2014-09-02 13:05:03 +02:00
Laurent Destailleur
e82e26c6fa Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	ChangeLog
	htdocs/compta/facture.php
	htdocs/core/js/lib_head.js
2014-09-02 12:57:33 +02:00
Laurent Destailleur
4fdfe05168 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-09-02 12:46:57 +02:00
Florian HENRY
9b40cc9e89 fix 2014-09-02 12:09:43 +02:00
Florian HENRY
832d1b37c1 Save also code of event 2014-09-02 11:32:38 +02:00
Florian HENRY
911aca399d save code event 2014-09-02 11:30:35 +02:00
Florian HENRY
0dd955875c Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-09-02 11:21:03 +02:00
Florian HENRY
c8a9f4600c Fix: list event view lost type event filter 2014-09-02 11:20:57 +02:00
Florian HENRY
67b308cb25 Fix: list event view lost type event filter 2014-09-02 11:15:01 +02:00
BENKE Charles
05ed96f7fa Update modContrat.class.php
add export contract/service feature
2014-09-02 10:45:53 +02:00
aspangaro
cb189ed83e Add salary payment 2014-09-02 05:10:25 +02:00
Juanjo Menent
cc858b2af0 Fix SQL syntax
ChangeLog
2014-09-01 22:41:36 +02:00
Juanjo Menent
2d0f353529 Merge pull request #1859 from FHenry/3.6
Fix SQL syntax
2014-09-01 22:26:21 +02:00
Florian HENRY
e2fac5dd91 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6
Conflicts:
	ChangeLog
2014-09-01 19:10:18 +02:00
Juanjo Menent
e6a387cb65 Merge pull request #1856 from aspangaro/develop-patch1
Typo
2014-09-01 18:44:09 +02:00
Florian HENRY
772acd6bf9 Fix missing $user in create method 2014-09-01 18:32:36 +02:00
Juanjo Menent
1f0653dd6d Merge pull request #1860 from FHenry/3.5
Fix missing $user in create method
2014-09-01 18:31:22 +02:00
Juanjo Menent
dc46d59d68 Fix: Unsubscribe emailing not working 2014-09-01 18:26:24 +02:00
Juanjo Menent
4372c58714 Fix: Unsubscribe emailing not working 2014-09-01 18:24:25 +02:00
Florian HENRY
db1c97bdad changelog 2014-09-01 11:52:20 +02:00