Commit Graph

66988 Commits

Author SHA1 Message Date
Laurent Destailleur
c56ef86bc3
Update project.lib.php 2018-05-25 10:50:16 +02:00
florian HENRY
dd946dd197 add ressource 2018-05-21 11:03:48 +02:00
florian HENRY
f5c245cd19 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_fixproject 2018-05-21 10:59:10 +02:00
florian HENRY
986b4f78ba fix eldy comment 2018-05-18 13:54:07 +02:00
Laurent Destailleur
e01d9a62bc
Merge pull request #8776 from defrance/patch-114
FIX : inversion of dateo and datee
2018-05-18 12:21:58 +02:00
Laurent Destailleur
429efcc979
Merge pull request #8772 from wdammak/patch-2
Documents generes movement warehouse
2018-05-18 12:20:58 +02:00
Laurent Destailleur
f211cfaf0c
Merge pull request #8777 from grandoc/new_branch_11_05_2018
clean and update code
2018-05-18 12:20:22 +02:00
Laurent Destailleur
f17fbfe125
Merge pull request #8814 from areaeuro/patch-2
Remove Warning: A non-numeric value encountered
2018-05-18 12:15:30 +02:00
Laurent Destailleur
01275a4cfe
Merge pull request #8771 from wdammak/patch-1
Add Documents generes warehouse module
2018-05-18 11:59:22 +02:00
Laurent Destailleur
0633d2f519
Merge pull request #8805 from bafbes/abb7007
Fix: Add journal label translation in journal list
2018-05-18 11:36:00 +02:00
Laurent Destailleur
004c85b4ed
Update journals_list.php 2018-05-18 11:35:37 +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
Laurent Destailleur
23a3923432
Merge pull request #8791 from aspangaro/8.0-a25
Update module assets (Add asset directory & langs)
2018-05-18 11:20:38 +02:00
Laurent Destailleur
dd53f414f8
Merge pull request #8788 from bugness-chl/develop
Fix #8722 useless sql ORDER BY
2018-05-18 11:16:08 +02:00
florian HENRY
a27c263747 NEW: add filter on project task list 2018-05-18 10:33:32 +02:00
areaeuro
11714b9b6b
Update societe.class.php
Line 2942 throws an error in php 7 "Warning: A non-numeric value encountered" when doing math sum, as substr() may be empty.
Convert to intval(substr()) to fix.
2018-05-18 10:27:54 +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
Laurent Destailleur
c9d23d3930
Merge pull request #8783 from grandoc/new_branch_12_05_2018
Clean and update code
2018-05-18 08:56:06 +02:00
Laurent Destailleur
689ef37d56
Merge pull request #8781 from atm-john/extend_import_lines_from_linked_element
Add propals lines inport on invoices.
2018-05-18 08:55:29 +02:00
florian HENRY
1b4dcefcb0 fix hookname as uniq by card 2018-05-18 08:52:13 +02:00
Laurent Destailleur
1581e73906 Trans 2018-05-17 18:04:30 +02:00
Laurent Destailleur
a279451241 Fix can use actionmsg for generic trigger 2018-05-17 17:58:29 +02:00
Laurent Destailleur
a23d1f6b82 Code comment 2018-05-17 16:50:40 +02:00
Laurent Destailleur
ffb6a5db81 Fix use correct stripe env 2018-05-17 16:07:44 +02:00
Laurent Destailleur
4f6b0fead6 Fix filter on test/live mode for stripe card 2018-05-17 15:13:16 +02:00
Laurent Destailleur
1645c14e25 Fix deletion of stripe card 2018-05-17 13:51:17 +02:00
Laurent Destailleur
200af6ea5c Fix stripe link 2018-05-17 09:45:31 +02:00
John
8175d90816 change case 2018-05-17 09:01:49 +02:00
Abbes Bahfir
933e277862 Fix: Add journal label translation in journal list 2018-05-16 19:59:56 +01:00
Laurent Destailleur
67ed1e0841 Fix filter criteria when using backto for events 2018-05-16 20:59:45 +02:00
Laurent Destailleur
133e736801 Fix save code 2018-05-16 20:52:45 +02:00
Laurent Destailleur
ac97ba9e36 Fix deletion of stripe card
Solve validation of recurring invoice
2018-05-16 20:41:01 +02:00
John
fddd3156b1 add hidden conf 2018-05-16 16:15:30 +02:00
John
c67ab2a758 add hidden conf 2018-05-16 16:14:49 +02:00
John
4a0195deee Fix merge mistake 2018-05-16 15:55:56 +02:00
John
f773317bf5 remove comment and move table 2018-05-16 15:55:42 +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
Laurent Destailleur
7099068f05 Fix calculation of vat paid 2018-05-15 14:47:04 +02:00
Laurent Destailleur
d52305cef8 NEW Add entry for the GDPR contact 2018-05-15 11:50:42 +02:00
Laurent Destailleur
f342c5c6b3 Page title first 2018-05-15 11:36:39 +02:00
Alexandre SPANGARO
675ae97f99 Update module assets (Add asset directory & langs) 2018-05-13 21:52:11 +02:00
Chl
9b2f62791b Fix #8722 useless sql ORDER BY 2018-05-13 15:52:47 +02:00
Laurent Destailleur
0c40dfa3f9 Translation 2018-05-13 14:30:48 +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