Commit Graph

43355 Commits

Author SHA1 Message Date
Juanjo Menent
ffc730d82f Merge pull request #1867 from aspangaro/develop-patch1
Payment VAT & Salaries :: Add controls on field required
2014-09-05 09:08:28 +02:00
Juanjo Menent
5b34897927 Merge pull request #1864 from aspangaro/develop-accounting
Patch Accounting Expert module
2014-09-05 09:06:34 +02:00
Laurent Destailleur
60c633fd8b Qual: Generalize hook afterPDFCreation.
New: Add hook beforePDFCreation
2014-09-04 23:24:19 +02:00
Laurent Destailleur
e7e48f6b2b Doxygen
Add constant to enable bank during proposal (not enough common).
2014-09-04 22:37:33 +02:00
Laurent Destailleur
a57e0d3505 Fix: Do not use &nbsp as value of a list 2014-09-04 19:27:59 +02:00
Laurent Destailleur
73ad0f9302 Fix: Bad use of fetch_lines 2014-09-04 18:58:33 +02:00
Laurent Destailleur
a9fb86e506 Fix: Dictionnary with one n 2014-09-04 18:41:28 +02:00
Laurent Destailleur
6da0077738 Fix: Not enough space 2014-09-04 15:48:49 +02:00
Laurent Destailleur
4333e96ecb Fix: Reason to have button greyed is wrong 2014-09-04 15:14:30 +02:00
Laurent Destailleur
8ec61b8ac6 Fix: bad balance of td 2014-09-04 14:43:16 +02:00
Laurent Destailleur
782aaf52ae Add method setEventMessages (can deal this->error and this->errors) 2014-09-04 14:39:18 +02:00
Laurent Destailleur
32fd2e03ce More log into notify class 2014-09-04 14:38:30 +02:00
Laurent Destailleur
5aaba31c6a Fix: Missing translation string 2014-09-04 14:38:02 +02:00
aspangaro
ec47bc05b5 Missing key language 2014-09-04 04:48:48 +02:00
aspangaro
102e85e1e7 Merge branch 'Upstream/develop' 2014-09-04 04:34:04 +02:00
aspangaro
de63388d33 Directory of file 2014-09-03 22:09:01 +02:00
aspangaro
291d70fa9d Payment Salaries :: Add field required & control on it 2014-09-03 21:48:15 +02:00
aspangaro
058cf8782c Payment VAT :: Add control on field required 2014-09-03 21:47:46 +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
Laurent Destailleur
be3f458754 Fix: Pb with pgsql 2014-09-03 11:30:13 +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
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
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
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
Florian HENRY
0473bc5138 Fix missing $user into create call categorie 2014-09-01 11:51:16 +02:00