Philippe Grand
26df028efe
Update bilan.php
2017-05-11 09:17:43 +02:00
Philippe Grand
be6be3e533
Update bilan.php
2017-05-11 09:16:44 +02:00
Philippe Grand
449869c37b
Update bilan.php
2017-05-11 09:15:35 +02:00
Philippe Grand
f231864b3f
Update bilan.php
2017-05-11 09:13:51 +02:00
alexis Algoud
c2f76522eb
fix form inside table
2017-05-11 09:04:14 +02:00
Laurent Destailleur
30cf3f2bda
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/class/account.class.php
htdocs/core/class/html.formfile.class.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/install/mysql/tables/llx_bank_account.sql
2017-05-11 00:03:06 +02:00
Laurent Destailleur
d19d733f95
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-05-10 23:28:24 +02:00
Laurent Destailleur
0734b99d3a
Fix sql syntax
2017-05-10 23:27:48 +02:00
Laurent Destailleur
7ab151dc0d
Merge pull request #6809 from Gecka-Apps/5.0
...
New-Caledonia uses the same bank accounts patterns than France
2017-05-10 23:02:29 +02:00
Laurent Destailleur
1c7d9b9d9a
Merge pull request #6804 from aspangaro/6.0-multijournal
...
New : Accountancy - Add a list to select the bank journal in bank card
2017-05-10 22:46:30 +02:00
Benoit
ec4e416a6c
Fix bug xhen insert new bankline
2017-05-10 22:44:08 +02:00
Laurent Destailleur
33e93e9294
Merge pull request #6801 from benlo06/BUG_ACCOUT_CATEGORIES
...
Fix add new line for bank records
2017-05-10 22:43:18 +02:00
philippe grand
b7b16dc632
Update code using new css class
2017-05-10 16:41:19 +02:00
alexis Algoud
bba8f972a1
FIX situation invoice broken
...
due to the all percent application form inside addline form
2017-05-10 16:10:14 +02:00
Laurent Destailleur
199b4dfeb5
Merge pull request #6816 from Gecka-Apps/5.0-fixes
...
Add local taxes support to predefined invoices
2017-05-10 14:52:23 +02:00
Laurent Destailleur
5e54567558
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
dev/skeletons/skeleton_list.php
2017-05-10 13:30:35 +02:00
Laurent Destailleur
3e0fcf5ec2
Fix label "total for this page" on last page.
2017-05-10 11:57:59 +02:00
Laurent Destailleur
383dfc0c96
FIX Pagination of invoices
2017-05-10 11:51:59 +02:00
Laurent Destailleur
e5c898e0d6
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
build/makepack-dolibarr.pl
htdocs/fichinter/list.php
htdocs/product/list.php
htdocs/projet/tasks/list.php
2017-05-10 00:48:27 +02:00
Laurent Destailleur
6d01bd712d
FIX Better sanitizing of search all parameter.
2017-05-09 19:36:10 +02:00
Laurent Destailleur
0b97ee42cf
NEW Can use a credit note into a "down payment/deposit".
2017-05-09 18:15:50 +02:00
Laurent Dinclaux
c88656edb4
Fix PHPDOC comments
2017-05-09 23:59:37 +11:00
Laurent Dinclaux
6cac627117
Add support for localtaxes to predefined invoices
2017-05-09 23:19:16 +11:00
Alexandre SPANGARO
16a41242d3
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-05-08 06:39:14 +02:00
Laurent Dinclaux
8c75fc0e52
New-Caledonia uses the same bank accounts patterns than France
2017-05-07 14:11:47 +11:00
Alexandre SPANGARO
7c4b47f20d
Update works
2017-05-06 08:33:12 +02:00
Alexandre SPANGARO
68aaef2f66
Add list to select journal in bank
2017-05-06 08:06:01 +02:00
Benoit
e28dff19ee
Fix bug xhen insert new bankline
2017-05-05 22:21:46 +02:00
Laurent Destailleur
806157ae40
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-05 17:52:22 +02:00
Laurent Destailleur
15d20497c8
FIX #6795 #6796
2017-05-05 17:46:22 +02:00
Laurent Destailleur
11b1a2adac
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/journal/bankjournal.php
htdocs/accountancy/journal/expensereportsjournal.php
htdocs/accountancy/journal/purchasesjournal.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/comm/propal/class/api_proposals.class.php
htdocs/comm/propal/class/propal.class.php
htdocs/compta/bank/index.php
htdocs/compta/facture.php
htdocs/core/class/html.form.class.php
htdocs/includes/odtphp/Segment.php
htdocs/langs/en_US/admin.lang
htdocs/societe/soc.php
2017-05-05 14:49:25 +02:00
Laurent Destailleur
65e03ca3ba
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-05 12:34:22 +02:00
Laurent Destailleur
68b63927e0
Maxi miscellaneous debug
2017-05-05 12:33:49 +02:00
Laurent Destailleur
5f507dd6ed
Merge pull request #6777 from aspangaro/6.0-accountancy_bank
...
Use getnomUrl on bank accountancy number
2017-05-05 10:00:32 +02:00
Laurent Destailleur
82c8cee1ff
Merge pull request #6751 from AlainRnet/patch-5
...
FIX #6614 without html.formprojet.class.php called, not possible create invoice…
2017-05-04 20:58:50 +02:00
Laurent Destailleur
944cd40ef4
Merge pull request #6749 from atm-florian/5.0_fix6614
...
FIX #6614
2017-05-04 13:59:24 +02:00
Laurent Destailleur
3917bdfc79
Fix vat_src_code propagation.
2017-05-02 22:37:43 +02:00
Alexandre SPANGARO
fa4bb4e80a
Remove accounting.lib.php
2017-05-01 21:12:52 +02:00
Alexandre SPANGARO
e1e2481e37
Remove picto
2017-05-01 21:09:09 +02:00
Alexandre SPANGARO
102deccba7
Use getnomUrl on bank accountancy number
2017-05-01 21:06:31 +02:00
Laurent Destailleur
58e2b49b1c
Clean code
2017-04-30 13:49:06 +02:00
Laurent Destailleur
7c2b3b8df0
NEW When down payment is entered, discount to reuse into final invoice
...
is automatically created. This save one click into invoice workflow.
2017-04-30 12:55:11 +02:00
Laurent Destailleur
cc8e66d079
FIX Journal code of bank must be visible of accountaing module on.
2017-04-29 15:30:40 +02:00
Alexandre SPANGARO
586ea54bfc
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-29 07:05:02 +02:00
Laurent Destailleur
c722286bcb
Fix regressions
2017-04-28 13:37:36 +02:00
Laurent Destailleur
cfde27820e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/translation.php
htdocs/comm/card.php
htdocs/core/menus/standard/eldy.lib.php
2017-04-27 17:20:40 +02:00
Laurent Destailleur
5e856e6923
More complete tooltip help to describe available substitution vars
2017-04-27 17:16:19 +02:00
AlainRnet
d9cdaeb851
without html.formprojet.class.php called, not possible create invoice template
...
cf. https://github.com/Dolibarr/dolibarr/issues/6614
without this class AND module Projects disabled, it's not possible to create an invoice template. So I pulled out the call of the class from the condition.
2017-04-24 15:43:36 +02:00
florian HENRY
8f97177dae
FIX 6614
2017-04-24 14:44:44 +02:00
Alexandre SPANGARO
c3fe1c963a
Merge remote-tracking branch 'uptream/develop' into 6.0-stripe
2017-04-22 06:33:31 +02:00
