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
938d33941d
Merge pull request #6780 from marcosgdf/php7-warnings
...
Corrected PHP7 warnings for several pages
2017-05-05 09:59:25 +02:00
Laurent Destailleur
9785e9b298
Update commonobject.class.php
2017-05-05 09:57:51 +02:00
Laurent Destailleur
bd8e4cf6aa
Merge pull request #6762 from atm-alexis/develop
...
NEW Add option USE_PDFTK_FOR_PDF_CONCAT to use pdftk to concat mass pdf
2017-05-05 09:24:21 +02:00
Laurent Destailleur
db8c4a5ac4
Merge pull request #6760 from fappels/4.0_fix_download_delivery_doc
...
Fix download delivery and donation document
2017-05-05 09:21:19 +02:00
Laurent Destailleur
f069ef9844
FIX #6767
2017-05-05 09:16:11 +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
768df56c07
Uniformize name of standard PDF template
2017-05-04 20:16:55 +02:00
Laurent Destailleur
39d9a0f979
Support of pdf preview on supplier orders
2017-05-04 19:11:19 +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
88917afa08
Merge pull request #6740 from Hugome/fix-length_accounta
...
FIX: length_accounta return variable name
2017-05-04 12:45:45 +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
e096974b2c
Merge pull request #6735 from defrance/patch-6
...
NEW Add option SITUATION_DISPLAY_DIFF_ON_PDF to display progress or difference for situation invoices
2017-05-04 12:40:05 +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
8009370f04
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
...
Conflicts:
htdocs/contact/document.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/install/mysql/migration/repair.sql
2017-05-04 10:01:11 +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
alexis portable
428e16341c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into FIX_inventory
2017-05-02 22:46:33 +02:00
Laurent Destailleur
3917bdfc79
Fix vat_src_code propagation.
2017-05-02 22:37:43 +02:00
Laurent Destailleur
c673d283e0
Fix script to send emailings
2017-05-02 18:21:50 +02:00
alexis Algoud
12e91f1c1b
fix rights inventory only for MAIN_LEVEL_FEATURES = 2
2017-05-02 15:25:30 +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
7ae405a254
Corrected PHP7 warnings for several PDF document models
2017-05-02 14:08:20 +02:00
Marcos García de La Fuente
6e7fddee7d
Corrected PHP7 warnings for function pdf_einstein::write_file
2017-05-02 14:07:04 +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
31d99bbfe6
Complete event tracked automatically
2017-05-02 12:17:25 +02:00
Laurent Destailleur
6e1f825190
Look and feel v6
2017-05-01 13:01:05 +02:00
Laurent Destailleur
5af5c23a98
Look and feel v6
2017-05-01 12:46:40 +02:00
Marcos García de La Fuente
d658a833c9
FIX #6677 Expired contracts dashboard box does not show the name of the thirdparty
...
Close #6677
2017-05-01 12:05:52 +02:00
Alexandre SPANGARO
cbd0598611
Merge remote-tracking branch 'uptream/develop' into 6.0-multijournal
2017-05-01 08:16:55 +02:00
Alexandre SPANGARO
6afd0d642a
Finish to move accountancy journals list to page like dictionnary
2017-05-01 08:16:09 +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
Alexandre SPANGARO
fed1b152d9
Correct multi-journals
2017-04-30 07:41:47 +02:00
Laurent Destailleur
a9eeb823bd
Fix browser notif
2017-04-30 05:01:53 +02:00
Laurent Destailleur
60951cf307
Less data example
2017-04-30 04:09:50 +02:00
Laurent Destailleur
865c8140d1
Clean code
2017-04-30 03:23:06 +02:00
Laurent Destailleur
4993a43025
Move new feature inventory into module stock.
2017-04-30 02:25:05 +02:00
Laurent Destailleur
92b5f8d85e
Move new feature inventory into module stock.
2017-04-29 21:53:01 +02:00
Laurent Destailleur
f5bdfc426f
Merge pull request #6584 from atm-ph/NEW_inventory_coreobject_listview
...
New inventory coreobject listview
2017-04-29 21:31:46 +02:00
