Laurent Destailleur
b2e9d4cc21
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
2017-05-10 23:42:49 +02:00
Laurent Destailleur
2da0a129d1
Multiple file upload on by default on desktop.
2017-05-10 23:41:43 +02:00
Laurent Destailleur
164f3954ee
Merge pull request #6824 from ATM-Marc/NEW_multiple_fileupload
...
NEW permit multiple file upload in linked documents tab
2017-05-10 23:24:41 +02:00
Laurent Destailleur
2b64cf0ebe
Update html.formfile.class.php
2017-05-10 23:24:33 +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
jfefe
d410a320d7
WIP #6504 : CVE-2017-7886
...
'defaultlang' attribute was not filtered before database request which cause an SQL injection.
2017-05-10 20:32:54 +02:00
Laurent Destailleur
5a96ae54b9
FIX Link to files on bank account tab broken with multicompany
...
FIX Link to preview on thirdparty broken with multicompany
2017-05-10 19:08:07 +02:00
Marc de Lima Lucio
984531411d
NEW: permit multiple file upload in linked documents
2017-05-10 15:01:27 +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
9fe28c9b2c
NEW Can disable all overwrote translations in one click.
2017-05-09 10:08:04 +02:00
Laurent Destailleur
05d6c2cd75
Fix no more use of constant
2017-05-09 01:36:20 +02:00
Alexandre SPANGARO
a3602ff6b4
Add journal list in new movement card
2017-05-08 06:20:17 +02:00
Alexandre SPANGARO
dd97bbdc82
Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal
2017-05-07 15:10:30 +02:00
Laurent Destailleur
46ff62fc87
Work on inventory module debug
2017-05-06 22:28: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
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
2e5c32eb62
Merge pull request #6748 from atm-florian/5.0
...
FIX : #6747
2017-05-05 19:06:14 +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
a8292ce990
Code comment
2017-05-05 17:27:16 +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
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
a1ac3b470b
Change menu for setup of predefined emails
2017-05-05 14:01:20 +02:00
Laurent Destailleur
90542d119a
FIX trigger name and status set of setStatus for commercial proposal
2017-05-05 13:25:30 +02:00
Laurent Destailleur
9785e9b298
Update commonobject.class.php
2017-05-05 09:57:51 +02:00
Laurent Dinclaux
24a2fb57ea
Resolved merge conflict
2017-05-05 10:22:46 +11:00
Laurent Destailleur
089b882033
Merge pull request #6755 from atm-quentin/fix_ajax_autocomplete_clone
...
FIX ajax autocomplete on clone
2017-05-04 21:05:40 +02:00
Laurent Destailleur
bf616cbe05
Fix bad var
2017-05-04 19:05:02 +02:00
florian HENRY
b8d63ae6c0
Better fix
2017-05-04 14:04:30 +02:00
florian HENRY
9958fcaa6f
Merge branch '5.0' of https://github.com/Dolibarr/dolibarr.git into 5.0
2017-05-04 14:02:28 +02:00
Laurent Destailleur
c196e79bf4
Merge branch 'develop' into FIX_inventory
2017-05-04 13:50:53 +02:00
Laurent Destailleur
0c76db7973
FIX #6698 #6742
2017-05-04 13:41:37 +02:00
Laurent Destailleur
7d5b5cf86a
Better behavior for tooltip on click
2017-05-04 13:09:42 +02:00
Laurent Destailleur
c7d736376f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2017-05-04 12:41:49 +02:00
Laurent Destailleur
7ec46b3bd6
Finished work to have substitution keys code mutualized.
2017-05-04 12:35:45 +02:00
Laurent Destailleur
f543461e9b
Complete the substitution array with substitution array with all
...
possible keys
2017-05-04 11:21:28 +02:00
Laurent Destailleur
3871da0324
Merge pull request #6729 from atm-florian/dev_importexport_ressources
...
NEW : Add module resources import/export
2017-05-04 09:43:00 +02:00
Laurent Dinclaux
f63f28c7fe
Fix vat_src_code propagation between post types
2017-05-03 21:37:30 +11:00
alexis portable
da4d179d36
fix travis
2017-05-02 23:20:23 +02:00
alexis portable
d1a443f0f0
fix camelcase for travis
2017-05-02 23:11:05 +02:00
Laurent Destailleur
3917bdfc79
Fix vat_src_code propagation.
2017-05-02 22:37:43 +02:00
alexis Algoud
6138d197e4
FIX major issues for inventory
...
- Move all needed declaration from coreobject to commonobject for
updateCommon, fetchCommon, deleteCommon, createCommon
- Just leave method for child object into coreobject, check later if is
useless
- debug inventory card, PHP 7.0 compatibility
- activate rights for inventory into stock module
- add inventory options into stock admin module
2017-05-02 15:19:55 +02:00
Marcos García de La Fuente
166f2d262d
Corrected PHP7 warnings for function CommonObject::getTotalWeightVolume
2017-05-02 14:00:27 +02:00
Laurent Destailleur
1e3384a842
Fix travis
2017-04-30 14:16:58 +02:00
Laurent Destailleur
58e2b49b1c
Clean code
2017-04-30 13:49:06 +02:00
Laurent Destailleur
865c8140d1
Clean code
2017-04-30 03:23:06 +02:00
