Alexandre SPANGARO
dd97bbdc82
Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal
2017-05-07 15:10:30 +02:00
Laurent Dinclaux
8c75fc0e52
New-Caledonia uses the same bank accounts patterns than France
2017-05-07 14:11:47 +11:00
Laurent Destailleur
46ff62fc87
Work on inventory module debug
2017-05-06 22:28:07 +02:00
Laurent Destailleur
f4447f9c87
Fix bookmark jump
2017-05-06 21:39:00 +02:00
Laurent Destailleur
910a925167
NEW Add last activation author and ip of modules
2017-05-06 20:43:14 +02:00
Laurent Destailleur
d948447600
Add button to disable all personalized default values in one click.
2017-05-06 17:08:38 +02:00
Laurent Destailleur
ab8dcbd366
Use virtual name
2017-05-06 16:36:05 +02:00
Laurent Destailleur
880e2d0f72
Fix packaging 5.0.2
2017-05-06 15:05:24 +02:00
Laurent Destailleur
c4475ca946
Add a protection to avoid to take modules into custom dir.
2017-05-06 14:56:16 +02:00
Laurent Destailleur
a9bb2eb24c
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-05-06 13:07:02 +02:00
Laurent Destailleur
a7e9dc1ce4
Prepare 5.0.2
2017-05-06 13:06:33 +02:00
Laurent Destailleur
44bdf91715
Add badge with nb of imported calendard on user tab
2017-05-06 12:43:45 +02:00
Philippe Grand
fe50dabf42
Merge branch 'develop' into new_branch_20_04
2017-05-06 11:05:33 +02:00
philippe grand
55feea5d98
Update code using new css class
2017-05-06 10:54:28 +02:00
mikee2
637e1a8d21
Update Segment.php
...
Add additional needed fields so that you can invoice yearly items. Have number and text descriptions to avoid future changes that may break existing invoices.
2017-05-06 10:49:37 +02:00
Alexandre SPANGARO
7c4b47f20d
Update works
2017-05-06 08:33:12 +02:00
Alexandre SPANGARO
8113e6c2f2
Update Accounting journal getNomUrl
2017-05-06 08:11:07 +02:00
Alexandre SPANGARO
68aaef2f66
Add list to select journal in bank
2017-05-06 08:06:01 +02:00
Alexandre SPANGARO
a4defb8102
Add html form for accountancy journals list
2017-05-06 07:02:34 +02:00
Laurent Destailleur
e8c60642e6
Translation fix
2017-05-06 03:21:47 +02:00
Laurent Destailleur
9b90e7aa09
Minor fix
2017-05-06 02:24:52 +02:00
Laurent Destailleur
56140ae572
Work on default focus
2017-05-06 01:09:22 +02:00
Laurent Destailleur
cea835744c
Look and feel v6
2017-05-05 23:06:46 +02:00
Laurent Destailleur
5e6b2897ad
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-05 22:57:52 +02:00
Benoit
0fbf27895a
Add fk_facture_fourn element to fetch lines objects
2017-05-05 22:33:34 +02:00
Benoit
e28dff19ee
Fix bug xhen insert new bankline
2017-05-05 22:21:46 +02:00
Laurent Destailleur
d53654e64f
Look and feel v6
2017-05-05 20:45:06 +02:00
Scrutinizer Auto-Fixer
d93552c8c5
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-05-05 17:13:29 +00:00
Laurent Destailleur
fb58dfa898
Merge pull request #6752 from grandoc/new_branch_24_04
...
Update code using new css class
2017-05-05 19:08:38 +02:00
Laurent Destailleur
2e5c32eb62
Merge pull request #6748 from atm-florian/5.0
...
FIX : #6747
2017-05-05 19:06:14 +02:00
Laurent Destailleur
d7e10085b8
Clean code. Using 2 different key for a param is not more allowed.
2017-05-05 18:42:11 +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
57e540af53
For better compatibility with module for 6.0
2017-05-05 17:46:40 +02:00
Laurent Destailleur
15d20497c8
FIX #6795 #6796
2017-05-05 17:46:22 +02:00
Laurent Destailleur
a8292ce990
Code comment
2017-05-05 17:27:16 +02:00
Laurent Destailleur
4b42a5fd86
Merge pull request #6775 from marcosgdf/bug-6677
...
FIX #6677 Expired contracts dashboard box does not show the name of the thirdparty
2017-05-05 17:05:06 +02:00
Laurent Destailleur
dc9cbed866
Look and feel v6
2017-05-05 17:04:35 +02:00
Laurent Destailleur
fc5f4007a1
Debug accountancy module. Page for bank journalization is still KO.
2017-05-05 16:54:05 +02:00
Laurent Destailleur
885a636351
Debug new journal list page
2017-05-05 16:35:05 +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
b7f7683e5a
Merge pull request #6774 from aspangaro/6.0-multijournal
...
Finish to move accountancy journals list to page like dictionnary
2017-05-05 14:21:55 +02:00
Laurent Destailleur
91c505c9c9
Update llx_accounting.sql
2017-05-05 14:20:59 +02:00
Laurent Destailleur
dfa81bc806
Merge pull request #6792 from aspangaro/6.0-agiris
...
New : Accountancy - Add export model towards Agiris
2017-05-05 14:15:51 +02:00
Laurent Destailleur
eb2124bfc8
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2017-05-05 14:14:53 +02:00
Laurent Destailleur
2120b9af85
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/theme/eldy/style.css.php
2017-05-05 14:14:21 +02:00
Laurent Destailleur
e830ea6714
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-05-05 14:02:10 +02:00
Laurent Destailleur
8a37eeea74
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-05-05 14:02:02 +02:00
Laurent Destailleur
919d5b2ef3
Fix missing translation
2017-05-05 14:01:32 +02:00
Laurent Destailleur
a1ac3b470b
Change menu for setup of predefined emails
2017-05-05 14:01:20 +02:00
Laurent Destailleur
d60e98a797
No payment information on a supplier proposal by default.
2017-05-05 13:50:14 +02:00
