2
0
forked from Wavyzz/dolibarr
Commit Graph

6235 Commits

Author SHA1 Message Date
Frédéric FRANCE
326e009cad Fix Typo 2014-11-23 17:42:06 +01:00
Laurent Destailleur
652b0f84a7 Fixed: Field is used only by module accounting so must have a condition
on it.
2014-11-23 17:03:22 +01:00
Laurent Destailleur
671243e8f6 Fixed: Bugs reported by scrutinizer
Fixed: Solve conflict between ->iban and ->iban_prefix.
2014-11-22 16:57:08 +01:00
Laurent Destailleur
d8767bfbae Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/product/class/product.class.php
2014-11-22 16:10:14 +01:00
Laurent Destailleur
9aab62ab36 Merge remote-tracking branch 'origin/3.5' into 3.6 2014-11-22 16:03:09 +01:00
Laurent Destailleur
eaa4b6cb56 Add PR manually because of conflict "#1678 & #1677 Untranslatable token" 2014-11-22 15:37:18 +01:00
Laurent Destailleur
d6f47227fe Fixed: [ bug #1646 ] Can't list unpaid invoices 2014-11-22 15:09:54 +01:00
Laurent Destailleur
5acdce0b9f Fixed: [ bug #1647 ] Can't list tax payments 2014-11-21 23:52:12 +01:00
Laurent Destailleur
ce98036725 Fixed: [ bug #1648 ] Can't see turnover report by product/services 2014-11-21 23:45:56 +01:00
Laurent Destailleur
80e62697f0 Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	htdocs/compta/bank/treso.php
2014-11-18 19:01:01 +01:00
aspangaro
31b90cf383 Add 1st version of calculator but need work 2014-11-17 06:38:06 +01:00
Laurent Destailleur
01279edfc8 Fixed: [ bug #1570 ] Negative supplier invoices do not appear in bank
planned transactions.
2014-11-16 16:36:32 +01:00
aspangaro
c256243bf7 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-16 08:41:39 +01:00
Laurent Destailleur
c186f13218 Fix: Param $action was not defined.
A better fix must be done later be removing useless hooks that are
duplicate with triggers.
2014-11-15 19:04:21 +01:00
Laurent Destailleur
445f696d28 Fix: Pb of object with wrong type. 2014-11-15 18:24:38 +01:00
Laurent Destailleur
d98bfb1d8d Fix: Bugs reported by scrutinizer 2014-11-15 15:19:37 +01:00
Christophe Battarel
7ed496d7d9 FIX: copy extrafields when creating order from propale and creating
invoice from order
2014-11-12 17:51:26 +01:00
aspangaro
c70539b3b2 Bug & merge 2014-11-12 07:33:03 +01:00
aspangaro
a55afd4f50 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-12 07:32:32 +01:00
Florian HENRY
9c795d2c4b Finnish bank extrafeilds 2014-11-10 13:18:27 +01:00
Florian HENRY
e9f754395d Start bank extrafields 2014-11-10 13:09:58 +01:00
aspangaro
3042bf4dc2 Correct lot of bugs 2014-11-10 06:08:50 +01:00
Laurent Destailleur
29298c73b9 Fix: Must show limit into list 2014-11-09 19:16:22 +01:00
aspangaro
9c3fa5a9eb Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-09 07:26:14 +01:00
Laurent Destailleur
6fd89c4b41 Fix: Missing translation 2014-11-08 20:05:56 +01:00
Laurent Destailleur
6762b98c00 Minor look enhancement during debug 2014-11-07 23:25:39 +01:00
aspangaro
840dfd780d Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-07 21:28:39 +01:00
Drosis Nikos
24439eb1a3 Fix : tva not coming from multiprice 2014-11-07 15:31:06 +02:00
aspangaro
16126891a6 Merge remote-tracking branch 'Upstream/develop' into develop-search 2014-11-06 06:41:09 +01:00
aspangaro
89296e3011 Typo search list 2014-11-05 22:27:26 +01:00
Laurent Destailleur
60ca5aa026 Debug of module withdraw. 2014-11-05 17:32:42 +01:00
Laurent Destailleur
90fb05805c Fix: Missing translation 2014-11-05 16:21:17 +01:00
aspangaro
cbfa90abca Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-04 20:57:05 +01:00
aspangaro
aecb985659 Update work 2014-11-04 20:53:07 +01:00
Laurent Destailleur
26bd214e72 Merge pull request #1996 from aspangaro/develop-search
Increase list search
2014-11-04 17:40:11 +01:00
Laurent Destailleur
0a0dd81c9a Fix: When selecting a carbon copy fro select list, mail was not attached
to user.
2014-11-04 13:54:18 +01:00
aspangaro
25433120e6 Merge remote-tracking branch 'Upstream/develop' into develop-loan 2014-11-04 06:16:03 +01:00
aspangaro
39e83576a2 prelevement list 2014-11-02 21:44:03 +01:00
aspangaro
5bf5b9b16f Trips list 2014-11-02 21:12:40 +01:00
aspangaro
10ed271e38 Search bank transactions 2014-11-02 20:18:46 +01:00
aspangaro
1dcb7a58f3 Presentation & fix SQL injection 2014-11-02 14:51:21 +01:00
aspangaro
ff68c685c0 Customers payments list 2014-11-02 14:41:19 +01:00
aspangaro
6109529c6c vat payments list & typo on css class 2014-11-02 14:19:28 +01:00
aspangaro
d6a42bda95 Merge remote-tracking branch 'Upstream/develop' into develop-search 2014-11-02 13:55:57 +01:00
Laurent Destailleur
5086450f35 Fix: Forging email content must use dol_concatdesc. 2014-11-02 12:32:38 +01:00
Laurent Destailleur
b74bdb8f7d Fix: Bad error message 2014-11-02 11:39:30 +01:00
aspangaro
26c63f3ea4 donation list 2014-11-01 15:06:46 +01:00
aspangaro
5122b32ccc Salaries list 2014-11-01 14:59:39 +01:00
aspangaro
a0d3dbd93c Social Contrib list 2014-11-01 14:52:05 +01:00
aspangaro
9e07c3a7b6 Typo 2014-11-01 14:51:52 +01:00