Commit Graph

58991 Commits

Author SHA1 Message Date
Laurent Destailleur
0a1ec514d2 Merge pull request #6772 from aspangaro/6.0-1
Add option on accounting account getNomUrl
2017-05-05 10:02:27 +02:00
Laurent Destailleur
8f5fa1d810 Merge pull request #6769 from atm-ph/fix_propal_without_fetch_lines
Fix Propal class doesn't have fetch_lines method yet
2017-05-05 10:01:42 +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
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
fecf5efa5b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-05 09:16:29 +02:00
Laurent Destailleur
f069ef9844 FIX #6767 2017-05-05 09:16:11 +02:00
Laurent Destailleur
aa8aa5672b Merge pull request #6753 from grandoc/new_branch_25_04
Update code using new css class
2017-05-04 21:03:11 +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
626c0d6d5e Add more substitution keys for PDFs. 2017-05-04 20:40:13 +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
Laurent Destailleur
ce05c74e47 NEW SUPPLIER_ORDER_EDIT_BUYINGPRICE_DURING_RECEIPT 2017-05-04 17:48:52 +02:00
Laurent Destailleur
ea58fb0b50 Fix triggered error 2017-05-04 15:52:12 +02:00
Laurent Destailleur
01188e4bc0 Merge pull request #6785 from atm-alexis/FIX_inventory
Fix inventory
2017-05-04 13:51:00 +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
1a6c118a5d Fix travis warning 2017-05-04 12:41:29 +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
322cca8032 Merge pull request #6731 from dvasseur/develop
FIX: fix params order for the addline() function
2017-05-04 09:55:33 +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 Destailleur
f70ee73747 Merge pull request #6716 from rassakali/patch-1
NEW Add hook into subscriptions
2017-05-04 09:36:01 +02: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
a115d4877b Fix for new property array fields 2017-05-02 22:37:23 +02:00
Laurent Destailleur
b8f5e93ab0 Debug inventory data model 2017-05-02 21:40:18 +02:00
Laurent Destailleur
0bc46facd7 Add missing vat_src_code on recurring invoices 2017-05-02 21:24:18 +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
Laurent Destailleur
ad095d7fb2 NEW Can set margins of PDFs 2017-05-02 14:26:51 +02:00
Laurent Destailleur
31d99bbfe6 Complete event tracked automatically 2017-05-02 12:17:25 +02:00
Laurent Destailleur
9641a240ea Complete vat dictionnary 2017-05-02 11:27:35 +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
Alexandre SPANGARO
94b69844f2 Add option no url 2017-05-01 20:39:46 +02:00
Alexandre SPANGARO
e58d2f428b Merge remote-tracking branch 'uptream/develop' into 6.0-1 2017-05-01 20:31:08 +02:00
Laurent Destailleur
8730add15f Better message for api key return 2017-05-01 16:38:15 +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
Laurent Destailleur
1dd462d947 Fix disable notification on smartphone 2017-04-30 23:39:35 +02:00
Alexandre SPANGARO
e11254a9bf Add option on accounting account getNomUrl 2017-04-30 15:04:51 +02:00
Laurent Destailleur
1e3384a842 Fix travis 2017-04-30 14:16:58 +02:00
Laurent Destailleur
072eb740c7 Fix php compatibility 2017-04-30 13:57:13 +02:00