Commit Graph

14494 Commits

Author SHA1 Message Date
Laurent Destailleur
492b1e7169 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-05-18 11:48:08 +02:00
Laurent Destailleur
e724cfd6a2 Merge pull request #8802 from atm-john/new_avoir_situation
Add credit note compatibility with situation invoice.
2018-05-18 11:34:10 +02:00
florian HENRY
a27c263747 NEW: add filter on project task list 2018-05-18 10:33:32 +02:00
Laurent Destailleur
e503aeb2e5 Merge pull request #8787 from aspangaro/8.0-a24
Update module assets
2018-05-18 09:05:46 +02:00
Juanjo Menent
0aa8c6f498 Fix: extrafiels is not passing orders to invoice 2018-05-17 19:05:25 +02:00
Laurent Destailleur
a279451241 Fix can use actionmsg for generic trigger 2018-05-17 17:58:29 +02:00
John
8710cf570d Add table thead and tbody for object lines 2018-05-17 16:52:16 +02:00
Laurent Destailleur
a23d1f6b82 Code comment 2018-05-17 16:50:40 +02:00
Laurent Destailleur
1645c14e25 Fix deletion of stripe card 2018-05-17 13:51:17 +02:00
John
b01893d536 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation_pull 2018-05-16 15:29:57 +02:00
Laurent Destailleur
ef395fc36b Fix scrutinizer bugs 2018-05-16 15:23:52 +02:00
Laurent Destailleur
ad32b3098a Too verbose log 2018-05-16 10:31:44 +02:00
Laurent Destailleur
3e27d7dd2a Report of turnover by vat rate / product type / country 2018-05-15 17:51:19 +02:00
BENKE Charlene
4bebc8149b Update html.formcontract.class.php 2018-05-13 21:17:15 +02:00
BENKE Charlene
f4af9ec22f Update html.formcontract.class.php 2018-05-13 19:38:30 +02:00
BENKE Charlene
b0757916c4 Update html.formcontract.class.php 2018-05-13 16:59:03 +02:00
BENKE Charlene
2f1800f3e2 Update html.formprojet.class.php 2018-05-13 15:34:26 +02:00
BENKE Charlene
537048a10a Update html.formcontract.class.php 2018-05-13 15:30:32 +02:00
Laurent Destailleur
a2d485c14f Fix management of enabled property extrafields 2018-05-13 14:27:40 +02:00
Laurent Destailleur
c76e866f41 CSS 2018-05-13 14:06:57 +02:00
Laurent Destailleur
302d9399e2 Fix search when using special char 2018-05-13 12:42:16 +02:00
Alexandre SPANGARO
938b529e99 Merge remote-tracking branch 'uptream/develop' into 8.0-a24 2018-05-13 07:52:47 +02:00
Alexandre SPANGARO
cb815e5e3b Update works 2018-05-13 07:50:24 +02:00
Laurent Destailleur
53b5733fb4 Fix test 2018-05-12 13:40:53 +02:00
Alexandre SPANGARO
9c6f92986e Upgrade works 2018-05-11 21:48:22 +02:00
Laurent Destailleur
9315d9c423 NEW Introduce permission "approve" for "leave request" like for "expense
report"
2018-05-10 18:56:21 +02:00
Laurent Destailleur
a65170ba2d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-10 14:16:19 +02:00
Laurent Destailleur
0c35bc5284 Standardize code 2018-05-10 14:15:52 +02:00
Laurent Destailleur
3c6d1ccbac Merge branch 'develop' into develop 2018-05-10 13:13:53 +02:00
Laurent Destailleur
63b9384ef6 No transmormation of data objectid before calling trigger 2018-05-10 12:34:23 +02:00
Laurent Destailleur
2fb5de6136 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-10 12:30:14 +02:00
Laurent Destailleur
c094a6c43e Reorder permissions 2018-05-10 12:29:58 +02:00
Laurent Destailleur
ee11a46a66 Merge pull request #8766 from fmarcet/develop
NEW Add Date delivery and Availability on Propals List
2018-05-10 12:18:27 +02:00
Laurent Destailleur
d020741173 Merge pull request #8757 from bafbes/abb7004
New : Translate list elements in journal selection
2018-05-10 12:15:34 +02:00
Laurent Destailleur
fddd628f08 Merge pull request #8764 from hregis/develop_email
NEW add pdf function to check if pdf file is protected/encrypted
2018-05-10 12:08:58 +02:00
Laurent Destailleur
f5f734e8ef Merge pull request #8756 from bafbes/abb7003
New : Translate accountancy journal menu entries
2018-05-10 11:58:26 +02:00
Laurent Destailleur
0bf1fe2908 Merge pull request #8753 from delcroip/patch-15
new: log message for missing translation
2018-05-10 11:56:56 +02:00
Laurent Destailleur
f476e3e304 Update translate.class.php 2018-05-10 11:56:49 +02:00
Laurent Destailleur
e1acc5f6d6 Merge pull request #8760 from ATM-Nicolas/fix_lines_drag_and_drop
FIX : Drag and drop lines with extrafields
2018-05-10 11:55:19 +02:00
Laurent Destailleur
afa9db2a88 Merge pull request #8752 from delcroip/patch-14
FIX Add properly the project models
2018-05-10 11:54:00 +02:00
Laurent Destailleur
842c6168a2 FIX #8762 2018-05-10 11:50:35 +02:00
Laurent Destailleur
32868421f5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-10 11:41:30 +02:00
Laurent Destailleur
9e807c1c01 Merge pull request #8751 from wdammak/patch-7
Add models pdf to warehouse module
2018-05-10 11:41:03 +02:00
Laurent Destailleur
a4bd8f5722 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-10 11:39:40 +02:00
Laurent Destailleur
56b80d81dd Declare hook as addreplace hook 2018-05-10 11:39:29 +02:00
Laurent Destailleur
9077f18dd6 Update security.lib.php 2018-05-10 11:37:22 +02:00
Laurent Destailleur
8837193545 Merge branch 'develop' into permissions_hook 2018-05-10 11:36:08 +02:00
Laurent Destailleur
bc9eaaab84 Update security.lib.php 2018-05-10 11:34:20 +02:00
Laurent Destailleur
7be804dcf5 Update security.lib.php 2018-05-10 11:32:08 +02:00
Laurent Destailleur
0891766a3e Update security.lib.php 2018-05-10 11:31:27 +02:00