wdammak
1f43882bb7
Add liste_modeles to warehouse module
2018-05-22 01:09:52 +01:00
Laurent Destailleur
745aa4bd73
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-21 23:38:46 +02:00
Laurent Destailleur
8951c4a7a5
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-05-21 23:36:47 +02:00
Laurent Destailleur
de84f0e687
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/actions_massactions.inc.php
htdocs/filefunc.inc.php
2018-05-21 23:35:09 +02:00
Laurent Destailleur
afa57fd66d
Fix syntax error
2018-05-21 23:33:20 +02:00
Laurent Destailleur
69141c9493
Fix PSR True->true and GETPOST file name for local checksum check
2018-05-21 22:24:27 +02:00
Laurent Destailleur
e5561ecdfb
Remove useless files
2018-05-21 22:14:15 +02:00
Laurent Destailleur
1b20ec05d1
Save translation
2018-05-21 19:37:47 +02:00
Laurent Destailleur
c141c3ecfd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-21 19:35:26 +02:00
Laurent Destailleur
05c2f206ff
Fix missing lang
2018-05-21 19:35:12 +02:00
bgenere
227539d647
FIX : showOptionals function is now consistent with template
...
Extrafield_view.tpl.php for date and datetime fields
The jdate function is not called when not needed.
2018-05-21 16:55:35 +02:00
Marc de Lima Lucio
c9222adf6d
FIX: shipment: fk_proje(c)t not handled in fetch() and update() methods
2018-05-21 16:22:06 +02:00
Philippe
4d72573484
Merge branch '6.0' of https://github.com/Dolibarr/dolibarr into 6.0
2018-05-21 14:44:22 +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
22cdbffb0a
new : add adv targt emailing amdin with main feature level 1
2018-05-21 10:58:16 +02:00
Sean Wang
8e397b772f
Fix sql error
2018-05-21 14:19:41 +08:00
Alexandre SPANGARO
4d3ce7a3d6
Fix buttons
2018-05-20 14:08:47 +02:00
Alexandre SPANGARO
3fd55585b7
Salaries : Move to LoadLangs
2018-05-20 08:00:42 +02:00
Alexandre SPANGARO
c41a9291f1
Fix some problems & presentation
2018-05-20 07:46:02 +02:00
Alexandre SPANGARO
a4d3c4bed0
Fix language
2018-05-20 06:16:12 +02:00
Alexandre SPANGARO
0b581fc507
loadLangs
2018-05-19 08:06:52 +02:00
Alexandre SPANGARO
1af4a857be
Remove old code
2018-05-19 08:06:24 +02:00
Alexandre SPANGARO
e2665bd30e
NEW : Accountancy Add import on general ledger
2018-05-19 07:29:17 +02:00
wdammak
5fef8c2dc1
Add generateDocument function to entrepot class
2018-05-18 14:59:42 +01:00
gauthier
4c3f9d6d5e
FIX : test is_erasable() must be done before call function delete() too to avoid delete invoice with &action=delete in url
2018-05-18 15:20:16 +02:00
florian HENRY
986b4f78ba
fix eldy comment
2018-05-18 13:54:07 +02:00
BENKE Charlene
24d353c9a7
inversion of dateo and datee
2018-05-18 12:24:44 +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
7de812d2ed
Merge pull request #8793 from atm-john/Fix_situation_discount_used
...
Fix creating next situation invoice if a discount was allready apply
2018-05-18 12:18:58 +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
b5f37b2876
Merge pull request #8811 from fappels/7.0_fix_product_vat_update_errorhandling
...
Fix product vat update error handling
2018-05-18 12:00:03 +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
508f6c1a89
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-05-18 11:53:09 +02:00
Laurent Destailleur
6d0306f75a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2018-05-18 11:52:48 +02:00
Laurent Destailleur
5f8346f854
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-05-18 11:48:30 +02:00
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
75f5cdbc0f
Merge pull request #8810 from simnandez/7.0
...
Fix: extrafiels is not passing orders to invoice
2018-05-18 11:47:44 +02:00
Laurent Destailleur
24281028b7
Merge pull request #8807 from inoveaconseil/patch-2
...
Fix missing params for commonGenerateDocument
2018-05-18 11:43:11 +02:00
Laurent Destailleur
fa7f81c828
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-05-18 11:38:26 +02:00
Laurent Destailleur
a450f99e8a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/filefunc.inc.php
2018-05-18 11:38:11 +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
162d271884
Merge pull request #8803 from atm-alexis/7.0_fix_task_contact_card_withoutproject
...
FIX 7.0 task contact card without withproject parameters
2018-05-18 11:29:11 +02:00
Laurent Destailleur
71f8971a8e
Merge pull request #8794 from ATM-Nicolas/fix_select_user
...
FIX : Select user on add time spent form
2018-05-18 11:27:05 +02:00
Laurent Destailleur
078ea2ce9b
Merge pull request #8790 from aspangaro/7.0-f1
...
Fix : Double WHERE on admin/journal_list.php
2018-05-18 11:20:05 +02:00
Laurent Destailleur
e2369dea29
FIX #8722
2018-05-18 11:17:21 +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
John
3dd11e1eaf
Fix discount id
2018-05-18 11:02:04 +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
Juanjo Menent
dd259043cd
Fix: Cashdesk does not apply multi-price or price per customer
2018-05-18 09:20:18 +02:00
Laurent Destailleur
26e10caa7d
FIX #8813
2018-05-18 09:15:18 +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
fappels
90d2ccc79c
Fix product vat update error handling
...
Product vat update does not show update error if update result negative.
2018-05-17 21:29:15 +02:00
Juanjo Menent
0aa8c6f498
Fix: extrafiels is not passing orders to invoice
2018-05-17 19:05:25 +02:00
Juanjo Menent
dc7a1610e7
Fix: extrafiels is not passing orders to invoice
2018-05-17 18:56:01 +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
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
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
Inovea Conseil
5804d1d4a3
Fix missing params for commonGenerateDocument
...
ADD param moreparams for compatibility with commonGenerateDocument
2018-05-17 10:16:44 +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
alexis Algoud
5c727c077b
fix task contact card without withproject parameters
2018-05-16 16:34:19 +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
florian HENRY
630e38072b
fix SQL and add hook
2018-05-15 17:02:54 +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
88bc2dd416
Correct insert
2018-05-14 20:59:38 +02:00
Laurent Destailleur
a46362a71f
Prepare 7.0.3
2018-05-14 15:17:10 +02:00
Laurent Destailleur
c8e758411d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-05-14 15:16:33 +02:00
Laurent Destailleur
9552a914d8
FIX link for projets not linked to a thirdparties
2018-05-14 15:16:19 +02:00
ATM-Nicolas
ca09fddfb3
FIX : Select user on add time spent form
2018-05-14 15:16:07 +02:00
John
b42c87256c
Fix_situation_discount_used
2018-05-14 14:55:33 +02:00
Alexandre SPANGARO
2f1ac6fad8
Fix : Double WHERE on admin/journal_list.php
2018-05-13 20:35:07 +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
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
Laurent Destailleur
b84baece3c
Code comment
2018-05-12 11:32:00 +02:00
Laurent Destailleur
63ed5dcccc
Fix securekey for new online payment form
2018-05-12 11:23:40 +02:00
Laurent Destailleur
94ccb44673
Fix bad url wor external subscription page
2018-05-12 11:02:44 +02:00
Philippe GRAND
29c735d8bd
Clean and update code
2018-05-12 10:46:17 +02:00
Philippe GRAND
edbe32ea0c
clean and update code
2018-05-11 22:31:17 +02:00
Alexandre SPANGARO
9c6f92986e
Upgrade works
2018-05-11 21:48:22 +02:00
Philippe GRAND
e5d8dec2f9
clean and update code
2018-05-11 12:18:45 +02:00
atm-john
6b2dfa0528
Extend lines import to propal
2018-05-10 21:06:18 +02:00
Laurent Destailleur
9315d9c423
NEW Introduce permission "approve" for "leave request" like for "expense
...
report"
2018-05-10 18:56:21 +02:00
BENKE Charlene
ce40a51bdb
inversion of dateo and datee
2018-05-10 16:08:45 +02:00
Laurent Destailleur
7f704231fe
Fix migration script
2018-05-10 14:20:05 +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
a6966fe295
Update main.inc.php
2018-05-10 13:12:24 +02:00
Laurent Destailleur
70a185a9e6
Update main.inc.php
2018-05-10 13:11:52 +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
9acd5f0446
Merge pull request #8761 from ATM-Nicolas/develop
...
FIX : Missing translations
2018-05-10 11:54:13 +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
4efc9f95cd
FIX #8775 (try better fix)
2018-05-10 11:48:18 +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
Laurent Destailleur
ea4c48047a
All new hooks must be addreplace hooks
2018-05-10 11:30:27 +02:00
wdammak
c0e5132108
Documents generes movement warehouse
2018-05-09 15:07:11 +01:00
wdammak
e62426546d
Add Documents generes
2018-05-09 15:02:46 +01:00
Ferran Marcet
70527e64c5
New: Add Date delivery and Availability on Propals List
2018-05-08 18:15:02 +02:00
Regis Houssin
415b7425fd
NEW add pdf function to check if pdf file is protected/encrypted
2018-05-08 09:45:10 +02:00
Ferran Marcet
d1fd39936c
Fix: Bug on invoice status list on left menu
2018-05-08 09:04:04 +02:00
ATM-Nicolas
fb9ace010f
FIX : Missing translations
2018-05-07 17:16:20 +02:00
ATM-Nicolas
5bc9799bf1
FIX : Drag and drop lines with extrafields
2018-05-07 16:30:22 +02:00
Abbes Bahfir
fd9b6365a7
New : Translate list element in journal selection
2018-05-07 09:20:19 +01:00
Abbes Bahfir
de8bd3f886
New : Translate accountancy journal menu entries
2018-05-07 08:43:41 +01:00
wdammak
d038bf3e4b
Merge pull request #8 from Dolibarr/develop
...
Update rep
2018-05-06 17:01:44 +01:00
delcroix Patrick
5ac2b51517
new: log message for missing traduction
...
It's often difficult to find out the missing translation
2018-05-06 17:29:30 +02:00
delcroix Patrick
a2c93e56ae
fixAdd properly the project models
...
Previous code was adding only the Task model (project model where actually push during the installation) and only one of the two model available.
2018-05-06 13:36:37 +02:00
Laurent Destailleur
20c50e809d
Start 6.0.8
2018-05-06 10:43:40 +02:00
Laurent Destailleur
5fe8249706
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
2018-05-05 23:22:04 +02:00
Laurent Destailleur
a842178689
Fix migration missing steps
2018-05-05 23:20:53 +02:00
Laurent Destailleur
7511ba52ae
NEW Suggest link to pay online for customer orders
2018-05-05 22:20:33 +02:00
Laurent Destailleur
f15da0b980
Fix chart of account initial data for syscohada
2018-05-05 22:15:19 +02:00
Laurent Destailleur
c34bfc229b
Fix syntax error
2018-05-05 19:39:58 +02:00
wdammak
fb81088a4b
Add models warehouse and movement
2018-05-05 13:44:11 +01:00
Laurent Destailleur
546da0ceda
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/core/modules/modStock.class.php
htdocs/product/inventory/list.php
2018-05-05 14:40:39 +02:00
Laurent Destailleur
9c68b81f59
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/admin/account.php
htdocs/projet/class/task.class.php
2018-05-05 14:34:54 +02:00
wdammak
c269699679
Add model_pdf to warehouse module
2018-05-05 13:33:34 +01:00
altatof
a8ecce9e6d
add hook for more permissions control
2018-05-05 14:31:17 +02:00
Laurent Destailleur
e254d6951d
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-05 14:29:54 +02:00
Laurent Destailleur
97f161b276
Update list.php
2018-05-05 14:25:44 +02:00
Laurent Destailleur
8baa529719
Update actions_massactions.inc.php
2018-05-05 14:22:52 +02:00
Laurent Destailleur
aba2ef7ad2
Update actions_massactions.inc.php
2018-05-05 14:22:18 +02:00
Abbes Bahfir
17b8de2cdd
New : Option INVOICE_CAN_REMOVE_DRAFT_ONLY to delete draft invoices with precedence over INVOICE_CAN_ALWAYS_BE_REMOVED
2018-05-05 12:57:29 +01:00
Laurent Destailleur
407343645e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-05 13:57:22 +02:00
Laurent Destailleur
95bd249ec6
Merge pull request #8740 from grandoc/new_branch_04_05_2018
...
Clean and update code
2018-05-05 13:49:54 +02:00
Laurent Destailleur
363eaf0d72
FIX Parameters to triggers must be set into $this->context array.
2018-05-05 13:44:49 +02:00
Laurent Destailleur
bdf4c0704b
Removed depreaceted not used method Categorie::get_nb_categories()
2018-05-05 13:40:45 +02:00
Laurent Destailleur
be561a63c2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-05 13:36:45 +02:00
Laurent Destailleur
a9c7f90512
Missing hook after deprecated trigger
2018-05-05 13:36:20 +02:00
Laurent Destailleur
e9008e9461
Merge pull request #8734 from grandoc/new_branch_03_05_2018
...
clean and update code
2018-05-05 13:28:47 +02:00
Laurent Destailleur
8b4b786969
Merge pull request #8730 from atm-arnaud/FIX_project_list_label
...
FIX label in getnomurl projectlist
2018-05-05 13:26:11 +02:00
Laurent Destailleur
44cb60e61d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-05-05 13:25:00 +02:00
Laurent Destailleur
f6ca1eb624
Fix permission name
2018-05-05 13:24:46 +02:00
Laurent Destailleur
c86ca55176
Merge pull request #8727 from ATM-Marc/NEW_conf_thirdparty_tag
...
NEW: hidden conf to assign category to thirparty neither customer nor prospect nor supplier
2018-05-05 13:16:42 +02:00
Laurent Destailleur
352676cd16
Merge pull request #8725 from fappels/Fix_7.0_ProductCombbination
...
FIX delete all product variants of a parent product
2018-05-05 13:14:55 +02:00
Laurent Destailleur
2f79a12c6b
Merge pull request #8720 from atm-florian/6.0_pjAndTskCounter
...
fix project and task visibility same as list
2018-05-05 13:13:25 +02:00
Laurent Destailleur
8d52c4f919
Merge pull request #8721 from atm-florian/6.0_fixtaskid
...
fix taskid
2018-05-05 13:13:04 +02:00
Laurent Destailleur
86697c58d8
Merge pull request #8712 from atm-quentin/develop_categ_filter
...
NEW thirdparty categ filter on lists
2018-05-05 12:56:27 +02:00
Laurent Destailleur
564d791697
Merge pull request #8710 from atm-quentin/develop
...
NEW cancel orders on massaction
2018-05-05 12:54:31 +02:00
Laurent Destailleur
7bb9615cff
Merge pull request #8702 from atm-florian/6.0
...
fix accountancy multientity
2018-05-05 12:53:36 +02:00
Laurent Destailleur
9aaf5b95a7
Merge pull request #8745 from wdammak/patch-5
...
Update llx_entrepot add model_pdf
2018-05-05 12:50:36 +02:00
wdammak
468f970d32
Update llx_stock_mouvement Add model_pdf
2018-05-04 18:10:55 +01:00
wdammak
e34bd1a222
Update llx_entrepot add model_pdf
2018-05-04 18:08:04 +01:00
Laurent Destailleur
634e58b7c9
Look and feel v8
2018-05-04 18:24:00 +02:00
Laurent Destailleur
8e2844b295
css
2018-05-04 17:55:29 +02:00
wdammak
d766cb66b8
Overload styles files from a current folder of module & theme
2018-05-04 16:14:41 +01:00
wdammak
279e00a793
Merge pull request #4 from Dolibarr/develop
...
Update
2018-05-04 16:11:54 +01:00
Philippe GRAND
b5f222f45a
Clean and update code
2018-05-04 14:14:04 +02:00
Laurent Destailleur
5cff4c152b
Add tab "time spent" in project view. Can swith gantt/list.
2018-05-04 11:25:21 +02:00
Laurent Destailleur
1f775c907d
Fix translation of % column in gantt view
2018-05-04 11:01:22 +02:00
Philippe GRAND
f3a70a40d7
clean and update code
2018-05-03 21:27:52 +02:00
Laurent Destailleur
08cf034e2f
FIX to allow IRPF not null even if main VAT is null.
...
From https://www.javierrguez.com/problema-facturas-irpf-sin-iva-dolibarr/
2018-05-03 13:39:44 +02:00
atm-arnaud
6245f25deb
FIX label in getnomurl projectlist
2018-05-03 11:47:31 +02:00
atm-quentin
f70df3490f
FIX add db commit
2018-05-03 10:53:24 +02:00
Marc de Lima Lucio
b0d05b4824
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_conf_thirdparty_tag
2018-05-03 09:47:25 +02:00
Marc de Lima Lucio
bc7b05537f
NEW: hidden conf to assign category to thirparty neither customer nor prospect nor supplier
2018-05-03 09:26:48 +02:00
wdammak
2cf1aa967c
Add warehouse models pdf
2018-05-03 01:01:05 +01:00
wdammak
bca8d0844e
Prepare the adding pdf models to the stock module
2018-05-03 00:38:38 +01:00
wdammak
33b96a4fb3
Merge pull request #1 from wdammak/wdammak-patch-1
...
Add: Overload styles files from a current folder of module & theme
2018-05-02 22:29:10 +01:00
fappels
db76fd7895
Fix delete all product variants of a parent product
...
User object missing
2018-05-02 22:33:23 +02:00
Laurent Destailleur
9e18c95a3f
Fix migration script
2018-05-02 19:54:07 +02:00
florian HENRY
46e94af594
fix taskid
2018-05-02 19:46:04 +02:00
florian HENRY
3657857d21
fix project and task visibility same as list
2018-05-02 19:29:18 +02:00
Laurent Destailleur
24518803fc
Clean code
2018-05-02 19:15:16 +02:00
Laurent Destailleur
dfe6e4bfc1
Doxygen
2018-05-02 19:08:59 +02:00
Laurent Destailleur
3aeb2d2ad1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-02 19:05:18 +02:00
Laurent Destailleur
d0fafc812e
Fix include of strip class only when required
2018-05-02 19:04:59 +02:00
Laurent Destailleur
123a93e6e3
Merge pull request #8703 from atm-florian/develop
...
FIX Compatibility of accountanty module with multicompany module
2018-05-02 18:29:13 +02:00
Laurent Destailleur
0310db7e15
Merge pull request #8715 from bafbes/abb6031
...
New : option to show database name in upper help menu
2018-05-02 18:26:50 +02:00
Laurent Destailleur
df60fb8d05
Merge pull request #8711 from ATM-Nicolas/new_display_price_ht_in_home
...
NEW : Display price HT on commercial area boards
2018-05-02 18:23:11 +02:00
bafbes
739317a794
New : option to show database name in upper help menu
2018-05-02 16:53:18 +01:00
atm-greg
942e2f40bf
addline manage rank on its own if not provided
2018-05-02 17:07:27 +02:00
atm-quentin
21b387a4c4
NEW thirdparty categ filter on lists
2018-05-02 15:01:32 +02:00
atm-quentin
a20ec7ba1e
NEW cancel orders on massaction
2018-05-02 14:37:35 +02:00
ATM-Nicolas
73c3529831
NEW : Display price HT on all commercial area boards
2018-05-02 14:36:55 +02:00
TuxGasy
12440e6a7e
Do not display multicurrency cols if currency of object is same as main currency
2018-05-02 11:30:35 +02:00
florian HENRY
daf829c9f7
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/install/mysql/migration/7.0.0-8.0.0.sql
2018-05-02 08:49:40 +02:00
florian HENRY
886ad9d4b6
check eldy message
2018-05-02 08:45:18 +02:00
wdammak
42dee75ba3
Add: Overload styles files from a current folder of module & theme
...
My goal is to overload css files only for the current module and without changing the source code of the module but just by adding a folder style in the module folder. Then just place the css files to overload in this folder they will be automatically added in the head.
The same method is applied to the current theme.
To test, for example, place a custom.css file in the societe/style/custom.css folder and check the head of a company module page.
2018-05-01 23:32:35 +01:00
Laurent Destailleur
2f2d17926d
Sort list
2018-05-01 20:52:25 +02:00
Laurent Destailleur
124abd39b6
Code comment
2018-05-01 20:31:57 +02:00
Laurent Destailleur
dc9892f803
Fix bad log
2018-05-01 20:17:03 +02:00
Laurent Destailleur
5e14b165c9
NEW Show last result code of cron jobs in error in red
2018-05-01 19:51:53 +02:00
Laurent Destailleur
cb76d2ce0f
Better logging
2018-05-01 18:58:19 +02:00
Laurent Destailleur
14fd740b04
Fix lang must be '' and not empty in email_template
2018-05-01 16:25:06 +02:00
Laurent Destailleur
c3b5664fb5
Fix sort order of email templates
2018-05-01 16:24:40 +02:00
Laurent Destailleur
3340598cf8
FIX Projet is not prefilled when created from overwiew page
2018-05-01 14:15:11 +02:00
Laurent Destailleur
3cad7c6998
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-05-01 12:51:46 +02:00
Laurent Destailleur
8be8249f85
Clean code, fix warnings
2018-05-01 12:40:42 +02:00
florian HENRY
c84f44a508
fix accountanty in multientity
2018-05-01 12:30:22 +02:00
florian HENRY
b5d7206519
fix 6.0 accountancy multientity
2018-05-01 12:02:33 +02:00
Laurent Destailleur
d975dd507b
Revert "No display object line curreny if not necessary"
2018-05-01 11:17:47 +02:00
Laurent Destailleur
b1f1ddc6d0
Merge pull request #8354 from tuxgasy/5.0_multicurrency_objectline_print
...
No display object line curreny if not necessary
2018-05-01 11:15:31 +02:00
Laurent Destailleur
f50a6149d5
Look and feel v8 (menu statistics at end)
2018-05-01 11:09:03 +02:00
Laurent Destailleur
3374c50e2d
CSS
2018-05-01 10:42:09 +02:00
Laurent Destailleur
b9e6f6eab8
Fix link to navigate in year only if filter is for a full year
2018-05-01 10:35:12 +02:00
Laurent Destailleur
ee69bdd3da
Merge pull request #8699 from DazzX/improve_stat_page
...
New : Reactivate next and previous link
2018-05-01 10:26:49 +02:00
Laurent Destailleur
de0721aba9
Merge pull request #8698 from DazzX/result_stat_refresh_link
...
Fix bug when click on refresh button
2018-05-01 10:22:07 +02:00
Laurent Destailleur
05d1613628
Merge pull request #8697 from DazzX/turnover_stat_refresh_link
...
Fix link "refresh" on turnover report
2018-05-01 10:20:04 +02:00
Laurent Destailleur
4eb4cf6506
Merge pull request #8693 from Librethic/fix-api-product-check-perm
...
FIX : missing english name for object
2018-05-01 10:19:27 +02:00
Laurent Destailleur
b21059ac25
Translation
2018-05-01 00:50:47 +02:00
Laurent Destailleur
9eea58e4c5
Translation
2018-04-30 20:19:28 +02:00
Laurent Destailleur
c9cca57b0f
NEW monthly VAT report show "Claimed for the period" + "Paid during this
...
period"
2018-04-30 20:02:16 +02:00
Laurent Destailleur
1bf56e58b3
Work on vat report
2018-04-30 18:21:04 +02:00
Laurent Destailleur
ab85fa8721
Backport EXPENSEREPORT_ALLOW_OVERLAPPING_PERIODS to solve blocking
...
situation.
2018-04-30 17:45:34 +02:00
Laurent Destailleur
56be581a98
Remove deprecated header
2018-04-30 15:31:05 +02:00
Laurent Destailleur
32ace6a8cf
NEW Add hook setContentSecurityPolicy
2018-04-30 15:17:38 +02:00
Laurent Destailleur
e79c907ae0
Fix edit of capital
2018-04-30 11:01:33 +02:00
Laurent Destailleur
4c12369a26
Debug module ticket
2018-04-30 10:33:36 +02:00
Laurent Destailleur
19c12f3103
Translation
2018-04-30 09:31:09 +02:00
Laurent Destailleur
55f982e504
Removed deprecated FPDI option and reorganise PDF setup page
2018-04-30 09:28:24 +02:00
Laurent Destailleur
6a76242611
Fix record with date_creation empty
2018-04-30 08:59:07 +02:00
Julien BARRET
bb2ef46ef4
Reactivate next and previous link
2018-04-30 00:24:47 +02:00
Julien BARRET
b099d834a0
Fix bug : when click on refresh button, next and previous button are broken.
...
Eg. in year 2018, next button point to year 4032!
2018-04-29 23:26:44 +02:00
Julien BARRET
efcc3f40fa
Fix link "refresh" on turnover report
2018-04-29 23:22:46 +02:00
Laurent Destailleur
984ef37ff5
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-29 20:19:05 +02:00
Laurent Destailleur
2fc2c44de4
Fix phpcs
2018-04-29 20:18:50 +02:00
Laurent Destailleur
9a345e99ef
Fix syntax error
2018-04-29 20:14:57 +02:00
Laurent Destailleur
0cdfd6800a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-29 20:11:47 +02:00
Laurent Destailleur
98ff3868a9
Fix translation
2018-04-29 20:11:17 +02:00
Laurent Destailleur
82a8513aed
Standardize code
2018-04-29 19:52:14 +02:00
Laurent Destailleur
e168240ab0
Debug module DAV
2018-04-29 18:32:15 +02:00
Laurent Destailleur
8b4ef1313a
FIX API for tickets
2018-04-29 18:24:24 +02:00
Laurent Destailleur
aafab12f4b
Debug API for ticket module
2018-04-29 18:06:31 +02:00
Laurent Destailleur
1a9476bff5
Fix edition of label of a vat payment.
2018-04-28 20:17:39 +02:00
Laurent Destailleur
e72c2e6a11
Enhance sorting of field for lists on field with several sort criterias
2018-04-28 19:54:41 +02:00
Laurent Destailleur
2241418b33
Fix look and feel v7
2018-04-28 18:43:29 +02:00
Laurent Destailleur
e8fd5ea5cd
Better translation
2018-04-28 17:18:38 +02:00
Laurent Destailleur
94d6e178f7
Work on vat report code rewrite
2018-04-28 16:06:46 +02:00
Laurent Destailleur
07b9a9b44d
Better US english
2018-04-28 13:08:09 +02:00
jfefe
7cedf55c27
FIX : missing english name for object
...
'product' is used by API to check perms and return a 401 error even if user has correct
permissions
2018-04-27 20:54:48 +02:00
Laurent Destailleur
257dc1cf77
Work on rewriting VAT reports
2018-04-27 19:17:34 +02:00
Laurent Destailleur
e94d5b8318
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-27 12:51:57 +02:00
Laurent Destailleur
c50700470b
Remove deprecated file
2018-04-27 12:51:39 +02:00
Laurent Destailleur
3b473943dc
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-27 12:44:07 +02:00
Laurent Destailleur
a80621471c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/card.php
2018-04-27 12:42:18 +02:00
Laurent Destailleur
e5df7e206b
Merge pull request #8224 from atm-ph/fix_6.0_supplier_order_from_supplier_proposal
...
Fix wrong price on supplier order line
2018-04-27 12:20:49 +02:00
Laurent Destailleur
d179cafa9c
Update fournisseur.commande.class.php
2018-04-27 12:19:32 +02:00
Laurent Destailleur
ecd84f6c45
Update fournisseur.commande.class.php
2018-04-27 12:18:45 +02:00
Laurent Destailleur
4c87cbf644
Update card.php
2018-04-27 12:14:51 +02:00
Laurent Destailleur
f1b9188e9b
Merge pull request #8563 from ATM-Marc/NEW_backurlforcard
...
NEW: default add action: new param $backurlforcard to redirect to card
2018-04-27 11:57:15 +02:00
Laurent Destailleur
fef5a24870
Update myobject_card.php
2018-04-27 11:52:40 +02:00
Laurent Destailleur
e88c67ab11
Update actions_addupdatedelete.inc.php
2018-04-27 11:52:10 +02:00
Laurent Destailleur
9aa5633977
Merge pull request #8691 from hregis/develop_email
...
Fix: use "socpeople" instead "societe"
2018-04-27 11:42:27 +02:00
Laurent Destailleur
1cbf5f1c5e
Merge pull request #8687 from dolibarr95/patch-43
...
NEW : Allow negative quantity for dispatch (supplier order)
2018-04-27 11:41:05 +02:00
Laurent Destailleur
c376cc5779
Merge pull request #8686 from grandoc/new_branch_26_04_2018
...
clean code
2018-04-27 11:39:32 +02:00
Laurent Destailleur
e3142fff39
NEW Add method to register distributed payments on invoices
2018-04-27 11:38:31 +02:00
Laurent Destailleur
469d909126
Revert "Revert "NEW : Adds a contact to an invoice with REST API""
2018-04-27 10:46:09 +02:00
Regis Houssin
2906358383
Fix: use "socpeople" instead "societe"
2018-04-27 10:42:10 +02:00
Laurent Destailleur
df9f4d3193
Revert "NEW : Adds a contact to an invoice with REST API"
2018-04-27 10:40:27 +02:00
Laurent Destailleur
fb582c2444
Merge pull request #8682 from Oeris/develop
...
NEW : Adds a contact to an invoice with REST API
2018-04-27 10:37:04 +02:00
Laurent Destailleur
db8ddc4712
Merge pull request #8680 from ATM-Nicolas/new_paymentsocial_trigger
...
NEW : Call to trigger on payment social contribution creation
2018-04-27 10:32:34 +02:00
Laurent Destailleur
3af67d4b92
Merge pull request #8679 from ATM-Nicolas/fix_wrong_trigger_name
...
FIX : Wrong trigger name
2018-04-27 10:32:17 +02:00
Laurent Destailleur
0a4bd14bc3
Merge pull request #8678 from defrance/patch-111
...
add $user on delete line
2018-04-27 10:31:19 +02:00
Laurent Destailleur
c40b50ca71
Fix typo
2018-04-27 10:23:09 +02:00
Laurent Destailleur
489318d4db
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-27 10:18:40 +02:00
Laurent Destailleur
aa30b946b6
Fix from #8677
2018-04-27 10:18:22 +02:00
Laurent Destailleur
8f60bd35a5
Merge pull request #8676 from atm-florian/7.0
...
fix commonobject double style
2018-04-27 10:14:13 +02:00
Laurent Destailleur
27997b8c11
Merge pull request #8675 from ATM-Nicolas/fix_link_credit_note
...
Fix link credit note
2018-04-27 10:12:31 +02:00
Laurent Destailleur
19d15c79dd
Merge pull request #8673 from frederic34/variantonservice
...
NEW Module variant supported on services
2018-04-27 10:01:28 +02:00
Laurent Destailleur
3faeb08b78
Merge pull request #8672 from ATM-Nicolas/fix_action_contact
...
FIX : Related contact printed in societe agenda
2018-04-27 10:00:18 +02:00
Laurent Destailleur
1d40d34123
Merge pull request #8669 from tomours/develop
...
Fix french bank holidays (Easter related)
2018-04-27 09:56:01 +02:00
Laurent Destailleur
42722da824
Update date.lib.php
2018-04-27 09:55:44 +02:00
Laurent Destailleur
dde86628e7
Update date.lib.php
2018-04-27 09:49:52 +02:00
Laurent Destailleur
e1cfe0e2dd
Update date.lib.php
2018-04-27 09:49:15 +02:00
Laurent Destailleur
2ecbd132aa
Merge pull request #8668 from tuxgasy/Add_Hook_ordersupplierdispatch
...
New ordersupplierdispatch hook
2018-04-27 09:47:22 +02:00
Laurent Destailleur
cee4df9b27
Merge pull request #8667 from grandoc/new_branch_23_04_2018
...
clean code
2018-04-27 09:46:55 +02:00
Laurent Destailleur
e2b936e2d8
Merge pull request #8666 from frederic34/patch-2
...
Update api_products.class.php
2018-04-27 09:45:40 +02:00
Laurent Destailleur
3301c99b75
Merge pull request #8664 from DazzX/turnover_stat
...
Fix Year selector issue in turnover statistics page
2018-04-27 09:40:50 +02:00
Laurent Destailleur
659fd46b76
Merge pull request #8653 from ATM-Marc/NEW_commonObject_array
...
NEW: work on CommonObject 'array' field typeNew common object array
2018-04-27 09:39:26 +02:00
Laurent Destailleur
59e5545aa7
Fix phpunit
2018-04-27 09:18:25 +02:00
dolibarr95
1fb6f79727
Update dispatch.php
...
Only without batch module enabled
2018-04-27 09:14:52 +02:00
Laurent Destailleur
69db960a92
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/projet/activity/perweek.php
2018-04-26 18:33:02 +02:00
Laurent Destailleur
46a8511c69
Look and feel v8 (delete button in end of list)
2018-04-26 18:25:57 +02:00
Laurent Destailleur
761d2b3667
FIX Not approved holidays must not be visible into timesheet
2018-04-26 17:44:36 +02:00
dolibarr95
14e68ea8f9
Allow qty to be negative
2018-04-26 16:42:08 +02:00
Philippe GRAND
966419254d
clean code
2018-04-26 15:44:15 +02:00
Philippe GRAND
502c837e04
Merge remote-tracking branch 'upstream/develop' into new_branch_23_04_2018
2018-04-26 15:36:15 +02:00
Laurent Destailleur
45c8bbbf74
NEW Can filter on progression in timesheet
2018-04-26 12:42:02 +02:00
Neil Orley
00fb4300fc
FIX : return type change from array to int
2018-04-26 12:03:55 +02:00
Neil Orley
bf3b99163d
NEW : Adds a payment for the list of invoices given as parameter
...
Adds a payment for the list of invoices given as parameter
ie : 1 payment for x invoice
2018-04-26 11:59:59 +02:00
Neil Orley
2fa69551de
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
2018-04-26 11:57:30 +02:00
Laurent Destailleur
bf829a4f9f
NEW Add name of day in the timesheet input page per day.
2018-04-26 11:12:41 +02:00
Laurent Destailleur
d988585f86
Save spaces in timesheet report page
2018-04-26 11:07:20 +02:00
Laurent Destailleur
36616cdd50
FIX When time is entered without hour, edit keeps this
2018-04-26 10:07:27 +02:00
Laurent Destailleur
21a18da43b
We can disable the "favorites" in select combo of countries
2018-04-25 21:06:51 +02:00
Laurent Destailleur
6b2bd93469
NEW Add dol_is_link function
2018-04-25 17:59:05 +02:00
Laurent Destailleur
39aef07c6b
FIX Only voters can send comments in public survey page
2018-04-25 17:14:18 +02:00
Marc de Lima Lucio
c044d9ab58
FIX: actioncomm export: type filtering not working
2018-04-25 16:20:09 +02:00
Neil Orley
991d5c4215
NEW : Adds a contact to an invoice
...
Adds a contact to an invoice using the REST API
2018-04-25 16:04:21 +02:00
Laurent Destailleur
83b762b681
FIX CVE-2018-9019
2018-04-25 16:01:06 +02:00
Laurent Destailleur
75a4891113
Add az09comma to sanitize sortfield/sortorder
2018-04-25 15:47:42 +02:00
Laurent Destailleur
59d0e9a64f
trans
2018-04-25 12:36:16 +02:00
Laurent Destailleur
ae412f228d
NEW Experimental DAV module provides a public and private directory
2018-04-25 12:22:02 +02:00
Philippe GRAND
458dc42692
clean and update code
2018-04-25 11:50:58 +02:00
ATM-Nicolas
f71755d454
NEW : Call to trigger on payment social contribution creation
2018-04-25 09:34:57 +02:00
ATM-Nicolas
e058ab40a0
FIX : Wrong trigger name
2018-04-25 09:24:22 +02:00
BENKE Charlene
c879232fd7
add $user on delete line
...
possible to hamonize the call function for all line->delete ?
2018-04-24 23:41:12 +02:00
Laurent Destailleur
5d01efb79d
Code comment
2018-04-24 20:27:02 +02:00
Philippe GRAND
c22ef109ac
clean and add new code
2018-04-24 17:42:13 +02:00
Philippe GRAND
bf1e5bc618
Merge remote-tracking branch 'upstream/develop' into new_branch_23_04_2018
2018-04-24 17:31:10 +02:00
Laurent Destailleur
a86f1c8fde
FIX Can't invoice contract once it was closed
2018-04-24 14:46:16 +02:00
Laurent Destailleur
90723357c4
Look and feel v8
2018-04-24 13:50:05 +02:00
Laurent Destailleur
5eb7c7ffff
FIX Edit of ref_supplier in supplier invoice
2018-04-24 13:22:34 +02:00
Laurent Destailleur
9d070cac87
NEW Can add product in supplier order/invoice even w/o predefined price
...
Add option SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY,
SUPPLIER_ORDER_WITH_PREDEFINED_PRICES_ONLY and
SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY to restore restricted old
behaviour.
2018-04-24 12:57:31 +02:00
florian HENRY
70961bd075
fix perms
2018-04-24 12:46:16 +02:00
florian HENRY
67329b8805
fix commonobject double style
2018-04-24 12:33:07 +02:00
Frédéric FRANCE
6fc444e045
we can see what we are doing
2018-04-24 12:08:17 +02:00
ATM-Nicolas
b272d766a9
Merge branch 'develop' of github.com:Dolibarr/dolibarr into fix_link_credit_note
2018-04-24 11:48:49 +02:00
ATM-Nicolas
64dde1595b
FIX : Credit note links set from source invoice links
2018-04-24 11:48:26 +02:00
Laurent Destailleur
461ae46cc4
FIX When on a high page and searching for a small result, list was not
...
visible.
2018-04-24 11:37:57 +02:00
Laurent Destailleur
fcf91b6c8c
Look and feel v8
2018-04-24 11:12:12 +02:00
Frédéric FRANCE
5f4e2dc565
variant on services
2018-04-24 11:01:17 +02:00
Laurent Destailleur
be1089914e
Fix picto
2018-04-24 10:27:57 +02:00
Laurent Destailleur
decb93efa6
Fix NOIPCHECK
2018-04-24 10:17:57 +02:00
Laurent Destailleur
271e50ccf4
CSS
2018-04-24 10:06:13 +02:00
ATM-Nicolas
736c56705b
FIX : Related contact printed in societe agenda
2018-04-24 10:02:26 +02:00
ATM-Nicolas
3d179fb7d3
FIX : Fetch function will fetch comments
2018-04-24 09:17:03 +02:00
Laurent Destailleur
fb8ad77378
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/mysql/migration/6.0.0-7.0.0.sql
2018-04-23 23:09:53 +02:00
Laurent Destailleur
fdb3a11f34
FIX extrafields price and double were lost during a failed post.
2018-04-23 22:56:40 +02:00
Laurent Destailleur
0a5e606937
FIX extrafields price and double were lost during a failed post.
2018-04-23 22:53:57 +02:00
Laurent Destailleur
f95e5078c1
FIX Can't edit option PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY
2018-04-23 21:33:49 +02:00
Philippe GRAND
9e9d52a662
clean and update code
2018-04-23 16:23:30 +02:00
Philippe GRAND
bcf5c5d78a
clean code
2018-04-23 16:04:52 +02:00
Thomas OURSEL
4fd0ab3f31
Merge remote-tracking branch 'upstream/develop' into develop
2018-04-23 15:57:09 +02:00
Philippe GRAND
11d739494d
clean code
2018-04-23 15:51:21 +02:00
Frédéric FRANCE
657fa48c3f
Update api_products.class.php
2018-04-23 15:31:55 +02:00
Thomas OURSEL
f402753fa3
Fix french holidays (Easter related)
2018-04-23 15:14:34 +02:00
Laurent Destailleur
315d5bad39
FIX Error in ContractLigne not return to Contract
2018-04-23 15:07:50 +02:00
TuxGasy
6d552a2ae6
Add ordersupplierdispatch hook
2018-04-23 15:05:37 +02:00
Julien BARRET
8256bd1889
Fix Year selector issue in turnover statistics page
2018-04-23 11:39:34 +02:00
Laurent Destailleur
7065d16d85
FIX Error in ContractLigne not return to Contract
2018-04-23 10:35:11 +02:00
Laurent Destailleur
743f3d60f5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-22 20:59:42 +02:00
Laurent Destailleur
e9a2894727
Fix PSR2
2018-04-22 20:59:29 +02:00
Laurent Destailleur
54979bf3b3
Merge pull request #8660 from grandoc/new_branch_22_04_2018
...
update code
2018-04-22 20:30:59 +02:00
Laurent Destailleur
6aa2ca7462
Merge pull request #8659 from aspangaro/8.0-a24
...
Fix Accountancy
2018-04-22 20:30:42 +02:00
Laurent Destailleur
ffa8b7379b
Merge pull request #8658 from ptibogxiv/patch-26
...
fix getcountry
2018-04-22 20:29:31 +02:00
Laurent Destailleur
32511422ab
Fix PSR2
2018-04-22 20:08:29 +02:00
Laurent Destailleur
e834eff049
FIX #8650
2018-04-22 20:03:24 +02:00
Laurent Destailleur
ac89951acd
Merge pull request #8647 from fmarcet/develop
...
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-22 19:35:09 +02:00
Laurent Destailleur
68a0b45141
Merge pull request #8648 from grandoc/new_branch_20_04_2018
...
clean and update code
2018-04-22 19:31:46 +02:00
Laurent Destailleur
69adf73f4f
Clean code from $var = True
2018-04-22 19:27:37 +02:00
Laurent Destailleur
fec9303d18
Remove useless $var
2018-04-22 18:51:03 +02:00
Laurent Destailleur
46e448a086
Fix default agenda view
2018-04-22 17:57:20 +02:00
Laurent Destailleur
06cbc19103
Add meta generator in install pages
2018-04-22 12:10:53 +02:00
Laurent Destailleur
f83369d268
Remove travis warnings
2018-04-22 11:27:26 +02:00
Laurent Destailleur
769a1f507b
Debug asset module
2018-04-22 11:26:59 +02:00
Philippe GRAND
05f4e3c68e
update code
2018-04-22 11:14:01 +02:00
Alexandre SPANGARO
034f7d56e4
Invert credit debit
2018-04-22 06:49:04 +02:00
Alexandre SPANGARO
d8e7c98a8d
Add nature "inventory" & hide in ventilation journal
2018-04-22 05:56:31 +02:00
Laurent Destailleur
a0152f8e7a
Better template
2018-04-21 16:07:40 +02:00
Laurent Destailleur
06e51703b1
Clean constructors
2018-04-21 16:01:05 +02:00
Laurent Destailleur
912d5c53f2
Standardize code
2018-04-21 15:54:05 +02:00
Laurent Destailleur
411949a6bb
Optimize constructors
2018-04-21 15:08:46 +02:00
Laurent Destailleur
394b988a4e
FIX key in getEntity for supplier proposals
2018-04-21 14:41:31 +02:00
Laurent Destailleur
98cb95cc41
Fix deprecated labels
2018-04-21 13:19:12 +02:00
Laurent Destailleur
c81c744aaf
Clean deprecated var
2018-04-21 13:14:58 +02:00
Laurent Destailleur
9eeaf5c3eb
dol_syslog now strftime instead of dol_print_date
2018-04-21 12:22:21 +02:00
Laurent Destailleur
ccd9aa8059
Fight against dolibarr warnings
2018-04-21 12:16:12 +02:00
Philippe GRAND
a8c7be3fb5
Typo
2018-04-21 12:14:51 +02:00
Laurent Destailleur
c30b0da07d
Clean code
2018-04-21 12:12:46 +02:00
Philippe GRAND
3856d64b63
update code
2018-04-21 12:07:19 +02:00
Philippe GRAND
410d1ee07d
Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018
2018-04-21 12:05:50 +02:00
Laurent Destailleur
cef9782179
Clean defined constant at begin of pages
2018-04-21 12:00:55 +02:00
Philippe GRAND
4e9c77a738
Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018
2018-04-21 11:46:03 +02:00
Laurent Destailleur
cca4b1cbf5
NEW Optimize load of hooks classes (save 1-5Kb of memory)
2018-04-21 11:24:45 +02:00
ptibogxiv
f5ef0441fd
fix for customer rereive and charge with sources
2018-04-21 11:23:02 +02:00
Laurent Destailleur
cc5d54faa5
Doc
2018-04-21 01:41:38 +02:00
ptibogxiv
f0c572717f
fix getcountry
...
note: stripe account may just be call with customer not card or source
2018-04-21 01:08:22 +02:00
Laurent Destailleur
f6743484dd
Better support of option COMPANY_AQUARIUM_CLEAN_REGEX
2018-04-21 00:58:42 +02:00
Laurent Destailleur
1031fcd796
logs
2018-04-21 00:37:05 +02:00
Laurent Destailleur
9b57dadc18
css
2018-04-21 00:05:14 +02:00
Laurent Destailleur
6afd4e67e9
Fix error in sources->retrieve when a stripeaccount is defined
2018-04-20 23:46:56 +02:00
Philippe GRAND
be600690cd
Fix : Bad value for modulepart
2018-04-20 16:47:49 +02:00
Philippe GRAND
53efccd98e
Merge remote-tracking branch 'upstream/develop' into new_branch_20_04_2018
2018-04-20 16:46:53 +02:00
Marc de Lima Lucio
39e890e2d7
FIX: handle non-js users
2018-04-20 16:43:27 +02:00
Marc de Lima Lucio
2bf66780cb
FIX: travis + code readability
2018-04-20 16:38:52 +02:00
Marc de Lima Lucio
41a0727481
NEW: work on CommonObject 'array' field type
2018-04-20 16:38:52 +02:00
Laurent Destailleur
22c6b596a7
Remove dead code
2018-04-20 15:56:10 +02:00
Laurent Destailleur
d0efc41983
New support of option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD
2018-04-20 14:50:11 +02:00
Laurent Destailleur
38d200d8a6
Fix left menu
2018-04-20 13:23:34 +02:00
Philippe GRAND
1ebdcae538
clean and update code
2018-04-20 11:30:40 +02:00
Laurent Destailleur
6b90558b7a
FIX File name not visible in email preview
2018-04-20 11:20:56 +02:00
Philippe GRAND
33505411a7
clean and update code
2018-04-20 11:17:45 +02:00
Ferran Marcet
6ced1a3264
New: Add same parameters on 'printFieldListTitle' hooks
2018-04-20 10:38:16 +02:00
Laurent Destailleur
123f03eb1c
Move info into the README.md that is shown automatically.
2018-04-20 10:21:08 +02:00
Laurent Destailleur
9107701b8b
Move info into the README.md that is shown automatically.
2018-04-20 10:20:34 +02:00
Laurent Destailleur
9df179f48a
Clean lang file
2018-04-20 10:09:26 +02:00
Laurent Destailleur
7d3d4e6c89
FIX Error not reported by batch
2018-04-20 09:46:02 +02:00
Laurent Destailleur
5794e38c54
FIX Close date not visible in service list
2018-04-20 09:45:49 +02:00
Laurent Destailleur
5f43ff3609
Fix no pitco if bank account not defined
2018-04-20 08:47:53 +02:00
Laurent Destailleur
b0b88d18df
Fix class not found
2018-04-20 02:08:09 +02:00
Laurent Destailleur
066d324e5f
nowrap
2018-04-20 02:02:30 +02:00
Laurent Destailleur
c5e0838946
Set position by default to 100
2018-04-20 01:56:35 +02:00
Laurent Destailleur
bbd1257222
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-20 01:50:08 +02:00
Laurent Destailleur
e621daa61d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-20 01:47:54 +02:00
Laurent Destailleur
7a703e149f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-20 01:39:48 +02:00
Laurent Destailleur
c6a53ca25d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/supplier_proposal/card.php
2018-04-20 01:39:26 +02:00
Laurent Destailleur
c10c962d3a
Merge pull request #8624 from inoveaconseil/patch-1
...
NEW add any predefined mail content
2018-04-20 01:31:37 +02:00
Laurent Destailleur
721ff3e1a4
Merge branch 'develop' into new_branch_19_04_2018
2018-04-20 01:30:57 +02:00
Laurent Destailleur
54154343b2
Merge pull request #8643 from ATM-Marc/FIX_7.0_commonobject_default
...
FIX: CommonObject: don't require 'notnull' field if 'default' set
2018-04-20 01:28:00 +02:00
Laurent Destailleur
e9728ed73b
Merge pull request #8639 from ruistrecht-alt/FIX_Minor_merge_issue
...
Fix minor merge issue
2018-04-20 01:22:35 +02:00
Laurent Destailleur
2f19ba11e5
Merge pull request #8637 from hregis/develop_ticket
...
Fix: dolibarrize
2018-04-20 01:22:19 +02:00
Laurent Destailleur
15aeffee7d
Merge pull request #8638 from ATM-Marc/FIX_showOutputField_empty_date
...
FIX: don't print empty date in CommonObject::showOutputField
2018-04-20 01:20:45 +02:00
Laurent Destailleur
788fd62205
Merge pull request #8636 from hregis/develop_pgsql
...
Fix: avoid Warning: A non-numeric value encountered + wrong var name
2018-04-20 01:20:19 +02:00
Laurent Destailleur
bb5d3ee47e
Merge pull request #8635 from aspangaro/8.0-a23
...
Accountancy - move to loadLangs
2018-04-20 01:19:51 +02:00
Laurent Destailleur
7baf0eddbc
NEW Add hidden option COMPANY_AQUARIUM_CLEAN_REGEX to clean generated
...
accounting account.
2018-04-20 01:10:57 +02:00
Laurent Destailleur
4ce313d864
NEW Can filter on country and taxid into the binding page
2018-04-19 23:52:37 +02:00
Laurent Destailleur
99feaf5275
Fix reposition class
2018-04-19 21:33:26 +02:00
Laurent Destailleur
16e27a445b
Sort type of email template combo list
2018-04-19 20:42:03 +02:00
Laurent Destailleur
17dd96ef31
Fix filter on email template
2018-04-19 20:17:54 +02:00
Laurent Destailleur
1389ce9e48
FIX Template of modules not enabled must not be visible
2018-04-19 20:12:43 +02:00
Laurent Destailleur
558bda5f27
Fix translation of extrafields
2018-04-19 17:45:00 +02:00
Philippe GRAND
ecda8bf55d
clean and update code
2018-04-19 17:07:36 +02:00
Philippe GRAND
ed087161f4
clean and update code
2018-04-19 16:50:47 +02:00
Regis Houssin
8977a9b7aa
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_ticket
Conflicts:
htdocs/public/ticketsup/create_ticket.php
htdocs/public/ticketsup/list.php
2018-04-19 16:42:00 +02:00
Laurent Destailleur
555c5f29e1
Ticket debug
2018-04-19 16:04:08 +02:00
Regis Houssin
5b79b76685
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
...
develop_ticket
Conflicts:
htdocs/core/class/html.formticketsup.class.php
2018-04-19 15:58:14 +02:00
Laurent Destailleur
0358e0f29f
Debug ticketsup
2018-04-19 15:11:26 +02:00
Laurent Destailleur
8acc752195
Debug ticket module
2018-04-19 14:44:21 +02:00
Laurent Destailleur
8aab183567
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-19 14:00:18 +02:00
Laurent Destailleur
fc167612c2
NEW class reposition can also work on POST (not only GET)
2018-04-19 13:59:20 +02:00
Laurent Destailleur
b1ea34f4e7
FIX DOL_AUTOSET_COOKIE was not correctly setting value of cookie
2018-04-19 13:54:43 +02:00
Laurent Destailleur
4472234637
Can set email in dol_print_error_email
2018-04-19 12:12:54 +02:00
Laurent Destailleur
d8e05c90f7
Can set email in dol_print_error_email
2018-04-19 12:12:19 +02:00
Laurent Destailleur
0f16ccbc4a
Enhance dol_encode/dol_decode function
2018-04-19 12:03:42 +02:00
Marc de Lima Lucio
893ce55852
FIX: commonobject: don't require notnull field if default set
2018-04-19 10:29:48 +02:00
Laurent Destailleur
41be1c3d3d
Removed deprecated class (method setCookie already exists for that)
2018-04-19 10:22:08 +02:00
florian HENRY
882863ab48
fix : define in conf dir_output for suipplier_proposal modules
2018-04-18 16:21:20 +02:00
florian HENRY
bf27ca1b11
fix : use template at the goos place for generate doc for supplier
...
propoal
2018-04-18 16:00:37 +02:00
Laurent Destailleur
1dc466e1fb
FIX CVE-2018-10095
2018-04-18 12:32:19 +02:00
Laurent Destailleur
7ade4e37f2
FIX CVE-2018-10094
2018-04-18 12:23:49 +02:00
Laurent Destailleur
6b3e5e2085
FIX sanitize setup params
2018-04-18 12:19:23 +02:00
Laurent Destailleur
5d121b2d3a
FIX CVE-2018-10092
2018-04-18 11:58:36 +02:00
Laurent Destailleur
fb3cae9ad3
Fix translation of country for GB
2018-04-18 11:36:44 +02:00
Rui Strecht
1bc8035f94
Fix minor merge issue
2018-04-18 10:31:10 +01:00
Marc de Lima Lucio
e88830820a
FIX: dont print empty date in CommonObject::showOutputField
2018-04-18 11:13:18 +02:00
Regis Houssin
a4cd087df0
Fix: some bugs
2018-04-18 10:30:03 +02:00
Regis Houssin
ff76e60c49
Fix: some bugs and warnings
2018-04-18 10:13:20 +02:00
Marc de Lima Lucio
1a9675e410
FIX: user $backtopage insteead of $backurlforcard
2018-04-18 10:12:19 +02:00
Regis Houssin
d6680b982a
Fix: file not physically removed
2018-04-18 09:42:29 +02:00
Regis Houssin
d841abd55a
Fix: missing value when reload
2018-04-18 09:37:29 +02:00
Regis Houssin
85c93c26a9
Fix: dolibarrize
2018-04-18 09:27:54 +02:00
Regis Houssin
eaecf7190a
Fix: avoid Warning: A non-numeric value encountered + wrong var name
2018-04-18 08:34:48 +02:00
Alexandre SPANGARO
fd7bc2e607
Accountancy - move to loadLangs
2018-04-18 06:20:34 +02:00
Laurent Destailleur
7256edc831
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-18 03:28:50 +02:00
Laurent Destailleur
bbfc4a3e17
NEW Look and feel v8 - Show Picto "+" on all links "Add record"
2018-04-18 03:26:15 +02:00
Laurent Destailleur
46d28acb44
Look and feel v8
2018-04-18 02:10:23 +02:00
Laurent Destailleur
b39755f7b9
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-18 00:16:14 +02:00
Laurent Destailleur
013f95f54b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-18 00:02:51 +02:00
Laurent Destailleur
e4635c9401
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-04-18 00:01:40 +02:00
Laurent Destailleur
963c5c2951
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-18 00:01:13 +02:00
Laurent Destailleur
c7789d2038
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-04-18 00:01:06 +02:00
Laurent Destailleur
a0f8aa50d5
CSS
2018-04-18 00:00:37 +02:00
Laurent Destailleur
5713a048fe
Merge pull request #8632 from aspangaro/8.0-a21
...
Fix Accountancy
2018-04-17 21:30:16 +02:00
Laurent Destailleur
d2d28ac851
Merge pull request #8629 from hregis/develop_pgsql
...
Fix: correct syntax for postgresql
2018-04-17 21:28:07 +02:00
Regis Houssin
ad197d01c1
Fix: avoid error
2018-04-17 21:16:17 +02:00
Regis Houssin
bab32e05e7
Fix: best practice for sequence
2018-04-17 21:08:40 +02:00
Laurent Destailleur
c551bf20e2
sys
2018-04-17 21:06:26 +02:00
Alexandre SPANGARO
e0c0f7fd9b
Fix Accountancy
2018-04-17 20:04:55 +02:00
Regis Houssin
c07b5d684c
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_pgsql
2018-04-17 19:37:38 +02:00
Laurent Destailleur
5f3de7f97e
Doc
2018-04-17 19:23:05 +02:00
Regis Houssin
955ff14c6f
Fix: correct syntax for postgresql
2018-04-17 19:06:14 +02:00
Laurent Destailleur
dd46d97138
Merge pull request #8628 from hregis/develop_multicompany
...
Fix: syntax error with postgresql
2018-04-17 18:55:46 +02:00
Laurent Destailleur
11897976c3
Merge pull request #8625 from hregis/6.0_multicompany
...
Fix: missing drop index with postgresql
2018-04-17 18:52:45 +02:00
Laurent Destailleur
fb81ce5117
Some fixes for postgresl migration
2018-04-17 18:32:04 +02:00
Regis Houssin
6d7bd7ce1e
Fix: syntax error with postgresql
2018-04-17 18:26:37 +02:00
Regis Houssin
9a210c1a91
Fix: syntax error for postgresql > 9.1
2018-04-17 17:33:40 +02:00
Regis Houssin
d89086cb7a
Fix: missing drop constraint with postgresql
2018-04-17 17:25:54 +02:00
Regis Houssin
dd835c4868
Fix: missing drop index with postgresql
2018-04-17 17:18:59 +02:00
Laurent Destailleur
e7281238a9
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-17 16:17:25 +02:00
Laurent Destailleur
eb3b351e83
Transifex sync
2018-04-17 16:17:07 +02:00
Laurent Destailleur
fee4966219
Merge pull request #8601 from frederic34/esign
...
NEW add optional esign field in pdf propal
2018-04-17 16:12:53 +02:00
Laurent Destailleur
bf4daa4752
Merge pull request #8622 from frederic34/contratlist
...
NEW display total on contract service list
2018-04-17 16:08:26 +02:00
Inovea Conseil
d032280a96
NEW add any predefined mail content
2018-04-17 16:03:12 +02:00
Frédéric FRANCE
aec601dbcc
display total on contract service list
2018-04-17 15:40:12 +02:00
Laurent Destailleur
89a6841fbc
Debug ticket module
2018-04-17 14:51:08 +02:00
Laurent Destailleur
8c23fe6764
Fix td
2018-04-17 14:49:21 +02:00
Laurent Destailleur
2135365e0a
Bug new extrafields architecture
2018-04-17 14:44:55 +02:00
Laurent Destailleur
89b5114882
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-17 14:34:37 +02:00
Laurent Destailleur
4dadfac74b
Debug usage of the new extrafield architecture
2018-04-17 14:34:17 +02:00
Laurent Destailleur
7bb8078b46
Fix translation of extrafields
2018-04-17 13:52:50 +02:00
Laurent Destailleur
7b53ec5198
FIX timestamp must be an int not a float
2018-04-17 12:41:13 +02:00
Juanjo Menent
9ae28d2bc2
Fix: zip not filter
2018-04-17 10:43:25 +02:00
ptibogxiv
3acd1b536b
Update stripe.php
2018-04-17 10:15:14 +02:00
ptibogxiv
8db9d19521
ADD minimal amount to require 3Dsecure if it's possible
2018-04-17 10:14:36 +02:00
Laurent Destailleur
d2f0d1f613
Add option MAIN_SEARCHBOX_CONTENT_LOADED_BEFORE_KEY because it is hard
...
to understand how it works when list is preloaded.
2018-04-17 10:01:14 +02:00
Laurent Destailleur
72c3a60d24
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-17 09:46:11 +02:00
Laurent Destailleur
80ece31631
Merge pull request #8607 from ATM-Marc/FIX_leftmenu_search
...
FIX: left search form: directly display all qualified objects
2018-04-17 09:45:55 +02:00
Laurent Destailleur
c3970f1a52
Code comment
2018-04-17 09:44:57 +02:00
Laurent Destailleur
7b3a9de9db
Merge pull request #8603 from frederic34/logintransp
...
login transparent when using background
2018-04-17 09:35:47 +02:00
Laurent Destailleur
f06412ebc1
Update style.css.php
2018-04-17 09:35:25 +02:00
Laurent Destailleur
1e0a660d24
More font awesome picto instead of img
2018-04-16 19:57:46 +02:00
Laurent Destailleur
106fb87d0a
NEW Can sort order of files in attach tab for leave and expensereport
2018-04-16 19:25:27 +02:00
Laurent Destailleur
faea6861c3
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/facture/invoicetemplate_list.php
htdocs/langs/en_US/bills.lang
2018-04-16 18:19:21 +02:00
Laurent Destailleur
f19abe38d7
FIX pdf thumb for expense report
2018-04-16 18:17:35 +02:00
Laurent Destailleur
27a8476117
FIX remove var_dump
2018-04-16 17:02:54 +02:00
Marc de Lima Lucio
ba50fcd130
FIX: left search form: directly display all qualified objects
2018-04-16 15:15:35 +02:00
Laurent Destailleur
622042e9b2
FIX Max nb of generation of recurring invoice should not show warning
2018-04-16 15:05:35 +02:00
Laurent Destailleur
50d86a7cfd
Fix accounting area when advanced accounting module not enabled
2018-04-16 14:25:39 +02:00
Laurent Destailleur
f1ad3912e7
Fix multicompany compatibility for recurring invoice generation
2018-04-16 14:18:38 +02:00
Laurent Destailleur
14ed19265c
FIX environment shown on cron card
2018-04-16 13:53:59 +02:00
Laurent Destailleur
0d0da234b1
Lowercase NULL, TRUE, FALSE according to PSR2
2018-04-16 13:51:16 +02:00
Laurent Destailleur
c702c88fde
CSS
2018-04-16 13:11:48 +02:00
Laurent Destailleur
e7f6785a53
Add log
2018-04-16 12:23:24 +02:00
Laurent Destailleur
0d26bdcdc5
FIX Button receive products not visible
2018-04-16 11:20:29 +02:00
Laurent Destailleur
d549090290
Fix translation of button action must be a verb
2018-04-16 11:12:56 +02:00
atm-greg
90f1ab8af4
add hooks on supplier documents
2018-04-16 06:46:22 +02:00
Laurent Destailleur
8c307987d8
css
2018-04-16 00:26:13 +02:00
Laurent Destailleur
69c26e19a8
NEW Can edit the text color for title line of tables
2018-04-15 22:01:52 +02:00
Laurent Destailleur
72de21537c
Clean code
2018-04-15 20:09:09 +02:00
Laurent Destailleur
6450f95c90
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-15 19:13:38 +02:00
Laurent Destailleur
2959dc4a3a
Fix regression
2018-04-15 18:20:04 +02:00
Laurent Destailleur
e2838aa074
NEW Show also size in bytes in tooltip if visible unit is not bytes
2018-04-15 17:58:13 +02:00
Laurent Destailleur
8fbde88872
Look and feel v8
2018-04-15 17:37:49 +02:00
Laurent Destailleur
9e50bbb9b1
standardize code
2018-04-15 16:35:18 +02:00
Frédéric FRANCE
46cfe1e2e7
Merge remote-tracking branch 'upstream/develop' into esign
2018-04-15 14:33:03 +02:00
Frédéric FRANCE
dec774ccf5
login transparent when using background
2018-04-15 14:03:05 +02:00
Laurent Destailleur
57c03553dd
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-04-15 12:09:07 +02:00
Laurent Destailleur
9ae789b358
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-15 11:42:12 +02:00
Laurent Destailleur
13ba69e085
Merge pull request #8595 from hregis/develop_ldap
...
Fix: broken $pdf object !
2018-04-15 11:38:51 +02:00
Laurent Destailleur
da66e5c5a7
Update pdf.lib.php
2018-04-15 11:38:29 +02:00
Frédéric FRANCE
d4c03230a0
add optional esign field in pdf propal
2018-04-15 11:34:21 +02:00
Laurent Destailleur
64dafbc37f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-04-15 11:33:40 +02:00
Laurent Destailleur
37e4da30d0
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-04-15 11:33:27 +02:00
Laurent Destailleur
daf63ca116
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-15 11:32:06 +02:00
Laurent Destailleur
5968ca8cf2
Merge pull request #8593 from frederic34/patch-2
...
Translation
2018-04-15 11:31:21 +02:00
Laurent Destailleur
e49e455c0c
Merge pull request #8598 from aspangaro/8.0-a19
...
Accountancy - list by account - Add some fix & functions
2018-04-15 11:31:01 +02:00
Laurent Destailleur
90b5adaef1
Merge pull request #8600 from aspangaro/8.0-a20
...
Fix export balance
2018-04-15 11:28:22 +02:00
Laurent Destailleur
514b1116b7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-15 11:28:05 +02:00
Laurent Destailleur
f9382ce395
Upgrade octicons
2018-04-15 11:27:39 +02:00
Laurent Destailleur
dbfee8117d
Merge pull request #8597 from atm-florian/dev_uniformcode
...
fix syntax and uniformize code
2018-04-15 11:26:18 +02:00
Alexandre SPANGARO
910d83d6e3
Fix export balance
2018-04-15 07:49:54 +02:00
Philippe GRAND
0a6bcb2a39
fix typo and translation
2018-04-15 07:37:23 +02:00
Philippe GRAND
7943a19402
fix typo
2018-04-15 07:07:04 +02:00
Alexandre SPANGARO
899ef6d2a6
Accountancy - list by account - Add some fix & functions
2018-04-15 06:55:18 +02:00
Laurent Destailleur
db385d64b6
Fix br
2018-04-14 23:24:01 +02:00
Laurent Destailleur
ffffd848a9
Look and feel v8
2018-04-14 22:34:46 +02:00
Laurent Destailleur
92d8867b6e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
2018-04-14 22:24:47 +02:00
Laurent Destailleur
187cc35786
Look and feel v8
2018-04-14 22:23:56 +02:00
Laurent Destailleur
fdbeb4265a
Look and feel v8
2018-04-14 22:22:29 +02:00
Laurent Destailleur
77b686500c
css
2018-04-14 21:07:20 +02:00
florian HENRY
ad403c7045
fix syntax and uniformize code
2018-04-14 17:04:38 +02:00
Laurent Destailleur
2f0780a51f
csss
2018-04-14 15:53:58 +02:00
Laurent Destailleur
96ef9802df
css
2018-04-14 15:44:57 +02:00
Regis Houssin
fb4765c472
Fix clean code
2018-04-14 15:24:52 +02:00
Regis Houssin
732f019fb2
Fix: json format in llx_const
2018-04-14 15:17:51 +02:00
Regis Houssin
25a87507b9
NEW add new parameters for tcpf encryption
2018-04-14 15:12:51 +02:00
Juanjo Menent
bfed1b9db1
FIX: some localtaxes errors
2018-04-14 12:45:40 +02:00
Regis Houssin
d97c052d08
Fix: broken $pdf object !
2018-04-14 10:41:38 +02:00
Regis Houssin
79c34f4d69
Fix: project category is type 6 not 5 !!
2018-04-14 10:03:21 +02:00
Frédéric FRANCE
9a001ed203
Translation
2018-04-14 09:51:11 +02:00
Laurent Destailleur
fea3182e93
NEW Can filter on account range in general ledger grouped by account
2018-04-14 00:01:54 +02:00
Laurent Destailleur
b4ef3945d2
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/fourn/facture/card.php
2018-04-13 23:52:08 +02:00
Laurent Destailleur
6cdb801ed8
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-13 23:50:12 +02:00
Laurent Destailleur
d833620285
Fix title of break in balance account report
2018-04-13 23:49:08 +02:00
Laurent Destailleur
f84b74f4cc
Merge pull request #8583 from hregis/develop_ldap
...
NEW add "printUserPasswordField" hooks
2018-04-13 23:36:20 +02:00
Laurent Destailleur
1ef8484abf
Merge pull request #8589 from atm-quentin/develop
...
NEW OnSearchAndListGoOnCustomerOrSupplierCard conf
2018-04-13 23:30:30 +02:00
Laurent Destailleur
c6f57b8ec4
Update societe.php
2018-04-13 23:29:47 +02:00
Laurent Destailleur
6a3c2f9808
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/fourn/facture/card.php
2018-04-13 23:27:14 +02:00
Laurent Destailleur
50a3b73a6f
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-04-13 23:21:29 +02:00
Laurent Destailleur
3ec295935c
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-04-13 23:21:18 +02:00
Laurent Destailleur
c25e21de4b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-13 23:19:22 +02:00
Laurent Destailleur
ecfabc6633
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/core/lib/functions.lib.php
2018-04-13 23:18:39 +02:00
Laurent Destailleur
a0e243a29b
Clean code
2018-04-13 23:11:19 +02:00
Laurent Destailleur
c4076fc8bd
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-13 23:08:34 +02:00
Laurent Destailleur
93ea46c58c
Merge branch 'develop' into develop-ecmfiles
2018-04-13 23:08:26 +02:00
Laurent Destailleur
8cfcdabcac
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2018-04-13 23:03:46 +02:00
Laurent Destailleur
ab720abca2
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-13 22:57:57 +02:00
Laurent Destailleur
a933e458e7
Repair type of product in invoice table from type of product
2018-04-13 22:57:43 +02:00
Laurent Destailleur
3b202b2255
Merge branch 'develop' into develop_bug5
2018-04-13 22:23:14 +02:00
Laurent Destailleur
374a0723bf
Fix VAT report by rate
2018-04-13 22:20:14 +02:00
Regis Houssin
556a418132
Fix: best method
2018-04-13 19:30:11 +02:00
Laurent Destailleur
32ff8ae132
Fix link
2018-04-13 18:02:25 +02:00
Laurent Destailleur
6f91b8019f
Remove warnings
2018-04-13 17:54:27 +02:00
Regis Houssin
199bf4c044
Fix: avoid focus problem when select2 is in a modal dialog window
2018-04-13 17:10:07 +02:00
Laurent Destailleur
300d6962d9
Fix step5 upgrade process
2018-04-13 17:05:35 +02:00
atm-greg
4fae1e3236
rank of invoice_supplier lines was always -1
2018-04-13 17:01:10 +02:00
fappels
e054d1ae8d
Try to fix travis
2018-04-13 16:49:03 +02:00
Laurent Destailleur
4251748aca
Clean code
2018-04-13 16:18:33 +02:00
atm-greg
8d4126274a
rang was missing on order_supplier lines
2018-04-13 15:53:49 +02:00
atm-quentin
ba5ac47602
NEW OnSearchAndListGoOnCustomerOrSupplierCard conf
2018-04-13 15:48:58 +02:00
fappels
9ba697ea98
Enable triggers
...
Add missing fields $src_object_type $src_object_id.
2018-04-13 15:12:36 +02:00
Laurent Destailleur
77a853e49d
Fix remove warning
2018-04-13 14:53:40 +02:00
Laurent Destailleur
86112f0096
Syntax error
2018-04-13 14:15:33 +02:00
Laurent Destailleur
9f5eed0c9a
Code comment
2018-04-13 14:12:31 +02:00
Laurent Destailleur
d4cd5a0d95
Fix syntax error
2018-04-13 13:37:43 +02:00
Laurent Destailleur
be965bdbab
Clean code
2018-04-13 13:28:48 +02:00
Laurent Destailleur
b68cded9c4
Clean code
2018-04-13 13:11:07 +02:00
Laurent Destailleur
f3e10c5a00
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-13 12:52:34 +02:00
Laurent Destailleur
fbae4429b7
Clean code for better extrafields management
2018-04-13 12:52:23 +02:00
Regis Houssin
e6ff852226
Fix: avoid Warning: Creating default object from empty value
2018-04-13 11:20:21 +02:00
Laurent Destailleur
1521b0595b
Clean code
2018-04-13 11:03:03 +02:00
Laurent Destailleur
78fcbe9633
FIX the extrafields separator was not translated
2018-04-13 10:48:29 +02:00
Laurent Destailleur
85161f91ac
Merge pull request #8581 from defrance/patch-110
...
printTopRightMenu trigger : numeric result never empty
2018-04-13 10:37:51 +02:00
Laurent Destailleur
b1043e2a57
Update main.inc.php
2018-04-13 10:37:40 +02:00
atm-greg
ef2c6a0ed4
fix sql error
2018-04-13 10:31:36 +02:00
atm-greg
58535993c1
use special_code on order_supplier lines
2018-04-13 10:31:27 +02:00
Laurent Destailleur
768b9d3d1e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-13 10:01:45 +02:00
Laurent Destailleur
04aafbc493
Fix css to restore focus undertext on select2 combo lists
2018-04-13 10:01:07 +02:00
Regis Houssin
a317c54b66
Fix: missing right parameter
2018-04-13 09:39:02 +02:00
Regis Houssin
7c3f0be83d
Fix: missing parameters
2018-04-13 09:09:26 +02:00
Regis Houssin
7d1292d838
NEW add "printUserPasswordField" hooks
2018-04-13 09:05:17 +02:00
BENKE Charlene
a7decb2173
printTopRightMenu trigger numeric never empty
...
maybe find something better
2018-04-13 02:42:19 +02:00
Laurent Destailleur
39ebaf40ac
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-13 00:58:37 +02:00
Laurent Destailleur
0bbe7043ef
Fyx syntax error
2018-04-13 00:58:23 +02:00
Laurent Destailleur
6e288fca75
Merge pull request #8575 from all3kcis/develop-patch-16
...
NEW Add files management on products lot
2018-04-13 00:57:13 +02:00
Laurent Destailleur
891925874f
FIX #8574
2018-04-13 00:54:08 +02:00
Laurent Destailleur
3078b890d4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/stripe/admin/stripe.php
2018-04-13 00:45:39 +02:00
Laurent Destailleur
ecd18da137
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-13 00:43:37 +02:00
Laurent Destailleur
f7bb781b42
FIX #8571
2018-04-13 00:43:15 +02:00
Laurent Destailleur
2fadfe4b6e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-13 00:42:20 +02:00
Laurent Destailleur
519ee64c1f
Translation
2018-04-13 00:42:08 +02:00
Laurent Destailleur
2bbde44f63
FIX #8580
2018-04-12 23:54:53 +02:00
Laurent Destailleur
d530337bdc
Merge pull request #8579 from hregis/develop_ldap
...
Fix: wrong permissions
2018-04-12 23:51:37 +02:00
Laurent Destailleur
341d1efb11
Fix clear filter must not lose type
2018-04-12 23:42:06 +02:00
Laurent Destailleur
ce402abda2
Debut ticket module
2018-04-12 23:33:38 +02:00
Laurent Destailleur
ace55ba569
Debug usage of extrafields for ticket module
2018-04-12 23:17:46 +02:00
Laurent Destailleur
3cecfd02c7
NEW Mutualize code for action="update_extras"
...
NEW Can use setValueFrom without user modification field
FIX Exclude separators from mandatory extrafields test
More code to use the new framework array for extrafields
Can use text condition in extrafield visibility
2018-04-12 23:16:23 +02:00
Laurent Destailleur
1c9661d9d6
FIX Update incoterm on supplier invoice
2018-04-12 21:39:12 +02:00
Laurent Destailleur
664f57a5f0
Clean code
2018-04-12 19:13:06 +02:00
Regis Houssin
ee61324caf
Fix: show \r\n if description contain <br>
2018-04-12 18:57:51 +02:00
Laurent Destailleur
4b38cf5329
Fix request at wrong place
2018-04-12 18:30:07 +02:00
Regis Houssin
bd95e5265e
Fix: wrong permissions
2018-04-12 18:05:12 +02:00
Laurent Destailleur
421a794942
FIX #8559 Bug to generate cheque receipt
2018-04-12 17:22:51 +02:00
All-3kcis
c35b454455
Fix bug productlot created without entity
2018-04-12 17:13:42 +02:00
All-3kcis
f1d1fdf951
Fix bug when entity=null on DB
2018-04-12 17:11:02 +02:00
florian HENRY
cd2f6616be
fix index creation with unique name for pgSQL
2018-04-12 16:41:53 +02:00
florian HENRY
def28be0ab
fix error on first install pgsql
2018-04-12 16:36:04 +02:00
All-3kcis
21df700325
Add option to save file with product batch ref
...
+ use batch number like ref instead of id
+ debug access to shared link
2018-04-12 15:55:08 +02:00
All-3kcis
a8fbf4a370
Add option to save file with product ref
2018-04-12 15:40:09 +02:00
All-3kcis
880fa55dd5
display user-friendly filesize
2018-04-12 15:29:22 +02:00
Laurent Destailleur
a8878c3f7e
FIX #6295
2018-04-12 15:17:15 +02:00
All-3kcis
f7e58f3c73
Add files management on products lot
2018-04-12 15:10:37 +02:00
Laurent Destailleur
dd022ee423
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-12 13:31:38 +02:00
Laurent Destailleur
ea2fd67e0d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/langs/de_DE/admin.lang
2018-04-12 13:31:14 +02:00
Laurent Destailleur
e437989853
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-12 13:25:27 +02:00
Laurent Destailleur
2b16ee75cd
Fix ref must be visible on combolist
2018-04-12 11:29:16 +02:00
Alexandre SPANGARO
251117fcce
Accountancy - Small fix
2018-04-12 06:07:22 +02:00
Laurent Destailleur
eec99b436e
Merge pull request #8565 from atm-greg/Add_supplierContactName_on_documents
...
Add supplier contact name on supplier documents
2018-04-11 19:25:01 +02:00
Laurent Destailleur
6cb0793d14
Merge pull request #7969 from marcosgdf/bug-4875
...
FIX #4875 Remove external module code from Dolibarr core code - Introduce hook initSendToSocid instead
2018-04-11 18:33:10 +02:00
Laurent Destailleur
e468584783
Update actions_sendmails.inc.php
2018-04-11 18:31:46 +02:00
Laurent Destailleur
3df873ee06
Merge pull request #8562 from ATM-Marc/FIX_modulebuilder
...
FIX: various modulebuilder-related issues
2018-04-11 18:01:04 +02:00
Laurent Destailleur
9ccba03a17
Update html.form.class.php
2018-04-11 18:00:34 +02:00
Laurent Destailleur
885c2389af
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-11 17:58:37 +02:00
Laurent Destailleur
afdd504e16
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/accountancy/journal/sellsjournal.php
2018-04-11 17:58:21 +02:00
Laurent Destailleur
698f5c165a
Merge pull request #8430 from atm-florian/dev_mailtouser
...
NEW : Can select from the user list into send form email (For field to and CC)
2018-04-11 17:55:40 +02:00
Laurent Destailleur
0f3d2cc8df
Merge pull request #8564 from atm-ph/fix_6.0_sellsjournal_situation_invoice
...
Fix wrong amount for situation invoice in sellsjournal
2018-04-11 17:51:00 +02:00
atm-greg
ae34fa6fbd
add supplier contact name on supplier documents
2018-04-11 17:42:26 +02:00
Laurent Destailleur
ac8520c114
Merge pull request #8557 from Gecka-Apps/7.0-substitution
...
Passes the list of third parties and the list of objects ref to the complete_substitutions_array function as parameters.
2018-04-11 17:40:38 +02:00
Laurent Destailleur
e543a6bf85
Merge pull request #8549 from atm-greg/fix_multiselect_filter
...
FIX #8480
2018-04-11 17:38:30 +02:00
Laurent Destailleur
1aace69b1a
Update functions.lib.php
2018-04-11 17:37:00 +02:00
Laurent Destailleur
d7da83ebc5
Merge pull request #8560 from atm-john/Fix_extrafield_list_from_table_entity
...
Fix extrafield entity query filter
2018-04-11 17:31:36 +02:00
Laurent Destailleur
e71ea882b3
Merge pull request #8556 from sadlig/develop
...
Fix value cond_reglement_id & mode_reglement_id
2018-04-11 17:30:00 +02:00
Laurent Destailleur
9634f4c82a
Update supplier_proposal.class.php
2018-04-11 17:29:45 +02:00
Laurent Destailleur
9a83a6ad6e
Merge pull request #8546 from atm-quentin/FIX_Issue_8455
...
FIX Issue #8455
2018-04-11 17:26:13 +02:00
Laurent Destailleur
693f0da2a6
Merge pull request #8545 from atm-florian/7.0_fix8436
...
fix #8436
2018-04-11 17:23:40 +02:00
Laurent Destailleur
e4f2e0ecbd
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-11 17:21:14 +02:00
Laurent Destailleur
590bc2948a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/bank/card.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
2018-04-11 17:20:49 +02:00
Laurent Destailleur
9fafefa0d7
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-04-11 17:18:09 +02:00
Laurent Destailleur
0518218aed
Fix regression
2018-04-11 17:17:03 +02:00
Laurent Destailleur
b68975f106
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-11 17:14:56 +02:00
Laurent Destailleur
c70e0c1cda
FIX #8475 #8540
2018-04-11 17:14:34 +02:00
atm-ph
6f526eb780
Fix wrong amount for situation invoice in sellsjournal
2018-04-11 16:40:59 +02:00
Laurent Destailleur
68b4b74d80
Merge pull request #8531 from all3kcis/patch-7
...
Add insertExtraFields into create/update
2018-04-11 16:34:21 +02:00
Laurent Destailleur
701aa53bdd
Update productlot.class.php
2018-04-11 16:33:12 +02:00
Laurent Destailleur
73a8966659
Merge pull request #8538 from atm-arnaud/FIX_8389_html_in_lang_DE
...
FIX #8389
2018-04-11 16:31:36 +02:00
Laurent Destailleur
307f217d56
Merge pull request #8543 from ATM-Nicolas/fix_duplicate_events
...
FIX : multiple creation of same event
2018-04-11 16:28:32 +02:00
Laurent Destailleur
23dba46c8c
Merge pull request #8551 from ATM-Nicolas/fix_datetime_extrafields
...
FIX : update wrong datetime extrafield
2018-04-11 16:28:04 +02:00
Laurent Destailleur
ca6b7205ef
Update commonobject.class.php
2018-04-11 16:27:56 +02:00
Laurent Destailleur
b732844e91
Merge pull request #8537 from atm-arnaud/FIX_8023_missing_escape_htmltag
...
FIX #8023
2018-04-11 16:25:33 +02:00
Laurent Destailleur
628b437e28
Update card.php
2018-04-11 16:25:05 +02:00
Laurent Destailleur
c392b9b8ef
Merge pull request #8541 from atm-gauthier/FIX_count_6.0
...
FIX #8478 !empty instead of count to avoid warning
2018-04-11 14:55:41 +02:00
Laurent Destailleur
75bc3d17e6
Update admin_extrafields_view.tpl.php
2018-04-11 14:55:29 +02:00
Laurent Destailleur
bc1515cb56
Merge pull request #8535 from atm-greg/Fix_dolGetFirstLastname
...
fix #8521
2018-04-11 14:54:15 +02:00
Laurent Destailleur
1f21078e08
Merge pull request #8536 from atm-florian/7.0_fix8474
...
fix #8474
2018-04-11 14:53:26 +02:00
Laurent Destailleur
ab43d9d675
Merge pull request #8544 from ATM-Marc/FIX_odt_cond_reglement
...
FIX: payment term doc-specific label was not used (issue #8414 )
2018-04-11 14:52:06 +02:00
Laurent Destailleur
1feee6378f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-11 14:45:52 +02:00
Laurent Destailleur
0d15d8e0ad
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/user/card.php
2018-04-11 14:45:11 +02:00
Laurent Destailleur
804703c9c9
Fix regression
2018-04-11 14:43:16 +02:00
Laurent Destailleur
e1c83df086
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-04-11 14:39:13 +02:00
Laurent Destailleur
560038fa18
Fix regression in update contact
2018-04-11 14:38:56 +02:00
All3kcis
00c8593567
remove hook
2018-04-11 14:09:30 +02:00
Laurent Destailleur
7adbc473c9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-11 13:26:37 +02:00
Laurent Destailleur
b652c53379
Sync transifex
2018-04-11 13:26:23 +02:00
Laurent Destailleur
c2eb2bf10e
Merge pull request #8542 from ATM-Marc/FIX_user_autocomplete
...
FIX: weird password autocompletion in Google Chrome (issue #8479 )
2018-04-11 13:22:42 +02:00
Laurent Destailleur
4f7fbb80ba
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-11 13:21:36 +02:00
Laurent Destailleur
21c65f812a
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-11 13:21:20 +02:00
Laurent Destailleur
edb59c05dc
Merge pull request #8525 from atm-greg/Add_projettaskcard_hook
...
add doActions hook on projettaskcard
2018-04-11 13:20:07 +02:00
Laurent Destailleur
73aa34dfbe
Merge pull request #8528 from hregis/7.0_bug6
...
FIX avoid Error: Call to undefined method mysqli::get_charset()
2018-04-11 13:19:33 +02:00
Laurent Destailleur
f54113b1a1
Merge pull request #8524 from frederic34/patch-10
...
FIX do not fill error with success message when using SwiftMailer
2018-04-11 13:19:04 +02:00
Laurent Destailleur
273eadab43
Merge pull request #8547 from ATM-Marc/NEW_linked_objects_orderby
...
NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked (issue #7830 )
2018-04-11 13:18:10 +02:00
Laurent Destailleur
ea35a445a1
Merge branch 'develop' into 8.0-a15
2018-04-11 13:17:12 +02:00
Laurent Destailleur
7d27af4778
Merge pull request #8552 from atm-arnaud/NEW_remove_element_in_categ
...
FIX #7730
2018-04-11 13:14:59 +02:00
Laurent Destailleur
ba526dd7f2
Merge pull request #8530 from hregis/7.0_bug3
...
FIX missing User object with API REST
2018-04-11 13:11:27 +02:00
Laurent Destailleur
b4d6811aff
Merge pull request #8522 from frederic34/patch-2
...
Update actions_mymodule.class.php
2018-04-11 13:10:07 +02:00
Laurent Destailleur
e642535389
Merge pull request #8561 from frederic34/patch-11
...
Update combinations.php
2018-04-11 13:09:34 +02:00
Laurent Destailleur
dcab5da980
Merge pull request #8553 from QuentinSu/patch-1
...
Update style.css.php
2018-04-11 13:08:12 +02:00
Laurent Destailleur
ab55426f2e
Merge pull request #8555 from aspangaro/8.0-a17
...
Fix : Migration 7.0.0 don't contains all new chart of accounts.
2018-04-11 13:07:50 +02:00
Laurent Destailleur
6731e238a3
Merge pull request #8550 from atm-quentin/FIX_Issue_8037
...
FIX issue #8037
2018-04-11 13:06:26 +02:00
Laurent Destailleur
7d7c0624d2
Update traduction.php
2018-04-11 12:59:24 +02:00
Laurent Destailleur
50dd75632c
Merge pull request #8532 from atm-arnaud/FIX_8359_project_link_categ_list
...
FIX #8359
2018-04-11 12:57:41 +02:00
Laurent Destailleur
9af052602a
Fix css
2018-04-11 12:54:57 +02:00
Laurent Destailleur
d02405dccd
Merge pull request #8533 from atm-quentin/FIX_issues_8470
...
FIX issue #8470
2018-04-11 12:52:44 +02:00
Laurent Destailleur
bf1e3705fb
Fix english
2018-04-11 12:47:10 +02:00
Marc de Lima Lucio
2a265e9de9
NEW: default add action: new param $backurlforcard to redict to card
2018-04-11 12:32:55 +02:00
Marc de Lima Lucio
fa8cf98249
FIX: modulebuilder: handle 'price' fieldtype
2018-04-11 12:18:54 +02:00
Frédéric FRANCE
a95bc76afb
Update combinations.php
2018-04-11 12:10:58 +02:00
Frédéric FRANCE
bc7623d383
Update getCombinations.php
2018-04-11 12:05:23 +02:00
Marc de Lima Lucio
bbc12cf06b
FIX: default addupdatedelete actions: uniformize add/update value checks
2018-04-11 11:49:29 +02:00
Marc de Lima Lucio
2f75bfcd83
FIX: modulebuilder: could not create html fields
2018-04-11 11:46:47 +02:00
Frédéric FRANCE
2c76a6cd80
Update combinations.php
2018-04-11 11:44:22 +02:00
Marc de Lima Lucio
c966cdbd47
FIX: selectForFormsList: entity checked even is object not multi-entity managed
2018-04-11 11:43:51 +02:00
John
96e26100f0
Add extrafield entity query filter
2018-04-11 11:27:47 +02:00
Laurent Destailleur
aa3c81c8bd
Translation
2018-04-11 10:15:54 +02:00
Laurent Destailleur
5cdebb4daa
Fix typo
2018-04-11 10:00:53 +02:00
atm-greg
7cdc1c8bef
Fix #8259 can't update contact birthday with REST API
2018-04-11 07:08:40 +02:00
Laurent Dinclaux
185c1aca13
Passes the list of third parties and the list of objects ref to the complete_substitutions_array function as parameters.
2018-04-11 13:27:25 +11:00
Gildas Rossignon
80a4428955
Fix value cond_reglement_id & mode_reglement_id
...
I had a bug when trying to create a supplier proposal by this way :
$fournisseur = new Societe($db);
$fournisseur->fetch(1);
$supplierproposal = new SupplierProposal($db, $fournisseur->id);
if ($supplierproposal->create($user) < 1) {
echo $supplierproposal->error . '<br/><br/>';
echo $db->lastquery;
}
This would generate an insert query with an empty value :
INSERT INTO llx_supplier_proposal (fk_soc, price, remise, remise_percent, remise_absolue, tva, total, datec, ref, fk_user_author, note_private, note_public, model_pdf, fk_cond_reglement, fk_mode_reglement, fk_account, date_livraison, fk_shipping_method, fk_projet, entity, fk_multicurrency, multicurrency_code, multicurrency_tx) VALUES (1, 0, 0, null, null, 0, 0, '2018-04-10 23:01:52', '(PROV)', '1', '', '', '', , , NULL, null, NULL, null, 1, 0, 'EUR', 1)
2018-04-10 23:11:32 +02:00
Laurent Destailleur
eeb2580f32
Fix foreign key error
2018-04-10 22:23:21 +02:00
Alexandre SPANGARO
130f270627
Fix : Migration 7.0.0 don't contains all new chart of accounts.
2018-04-10 21:16:36 +02:00
Laurent Destailleur
28d8acbf6a
Code sample
2018-04-10 20:55:31 +02:00
Laurent Destailleur
f78cf68fb4
Debug ticket module
2018-04-10 18:11:19 +02:00
Laurent Destailleur
f181719769
Can fetch a companypaymentmode of a thirdparty
2018-04-10 18:11:08 +02:00
QuentinSu
803ea150cb
Update style.css.php
...
Line break not taken into account in the GED module
2018-04-10 17:12:26 +02:00
ATM-Nicolas
cffe1e9771
FIX : Multiple creation of same event
2018-04-10 17:11:18 +02:00
atm-arnaud
0e66d26d06
FIX #7730
2018-04-10 16:46:36 +02:00
Laurent Destailleur
0dea2b08c2
Fix english translation of nb
2018-04-10 16:39:45 +02:00
ATM-Nicolas
47d5b1f6fd
FIX : update wrong datetime extrafield
2018-04-10 16:39:28 +02:00
Laurent Destailleur
7df0d01e01
Fix translation
2018-04-10 16:30:18 +02:00
atm-quentin
809b2a91ed
FIX issue #8037
2018-04-10 16:27:18 +02:00
atm-greg
8a0baaad17
fix #8480
2018-04-10 16:25:06 +02:00
Marc de Lima Lucio
7aa4d16eef
NEW: can specify SQL 'ORDER BY' clause in fetchObjectLinked
2018-04-10 16:23:56 +02:00
Laurent Destailleur
a06c9df86c
Fix translation
2018-04-10 16:01:32 +02:00
atm-quentin
cc832bd972
FIX Issue #8455
2018-04-10 15:47:06 +02:00
Laurent Destailleur
0bf4381226
NEW The field "visible" on extrafield can accept expression as condition
2018-04-10 15:39:11 +02:00
florian HENRY
3de793d88f
fix #8436
2018-04-10 15:28:05 +02:00
Marc de Lima Lucio
1fd5dba118
FIX: payment term doc-specific label was not used
2018-04-10 15:24:57 +02:00
Marc de Lima Lucio
307ede8b22
FIX: weird password autocompletion in Goocle Chrome (issue #8479 )
2018-04-10 15:03:50 +02:00
gauthier
5621d1f8ea
FIX #8478 !empty instead of count to avoid warning
2018-04-10 15:03:15 +02:00
atm-arnaud
26e9f10833
FIX #8389
2018-04-10 14:52:16 +02:00
atm-arnaud
848d76ee78
FIX #8023
2018-04-10 14:43:32 +02:00
florian HENRY
84f80795c3
fix #8474
2018-04-10 14:38:41 +02:00
atm-greg
4f13a4f45b
fix #8521
2018-04-10 14:16:01 +02:00
Maxime Kohlhaas
cb1a011b50
Fix default currency not set on supplier order creation from commercial menu #8459
2018-04-10 14:14:16 +02:00
atm-arnaud
d24b36f768
FIX #8359
2018-04-10 14:10:40 +02:00
atm-quentin
6277928b67
FIX issue #8470
2018-04-10 14:01:35 +02:00
Laurent Destailleur
7108f68db9
Remove old deprecated hook insertExtraFields. Triggers must be used for
...
action on CRUD events.
2018-04-10 12:03:01 +02:00
Laurent Destailleur
65996c47ff
Fix clean email syntax to remove , to avoid error RFC-5321 address
2018-04-10 11:15:21 +02:00
All3kcis
3cc3816391
Add $action before insertExtrafields hook
2018-04-10 10:17:06 +02:00
All3kcis
691e3df1c0
Add insertExtraFields in create
2018-04-10 09:59:07 +02:00
Regis Houssin
97bf6fff7f
Fix: missing User object with API REST
2018-04-10 08:07:23 +02:00
Laurent Destailleur
fae509e41d
Clean code
2018-04-09 14:25:15 +02:00
Laurent Destailleur
24f4d5040a
Move isInEEC from common to thirdparty class.
2018-04-09 14:25:02 +02:00
Laurent Destailleur
aa01afc0d5
Fix direct link on transifex using new search url
2018-04-09 13:57:09 +02:00
Regis Houssin
89ec185f51
Fix: avoid Error: Call to undefined method mysqli::get_charset()
2018-04-09 12:53:03 +02:00
Regis Houssin
976b5c26c7
Fix: TODO get_charset() function don't exists
2018-04-09 12:26:39 +02:00
Laurent Destailleur
54a86dc2b1
Fix CSS
2018-04-09 11:42:43 +02:00
Laurent Destailleur
a231074012
Save search criteria when using "back to" on accounting account
...
Change type of foreign key to be an integer to avoid CAST in requests
2018-04-09 11:31:24 +02:00
Laurent Destailleur
0475cb8018
FIX Permission for bookkeeper
2018-04-09 10:51:58 +02:00
John
63180f45a8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation
2018-04-09 09:17:26 +02:00
atm-greg
b1469ba761
add doActions hook on projettaskcard
2018-04-09 07:06:20 +02:00
Frédéric FRANCE
f5b49aa93b
do not fill error with success message
2018-04-09 00:21:29 +02:00
Laurent Destailleur
0c0f950338
Look and feel
2018-04-09 00:03:13 +02:00
Laurent Destailleur
cfa667f9df
Fix rounding in data shown
2018-04-09 00:01:15 +02:00
Laurent Destailleur
ff411ed2e5
NEW Add accounting account number on product tooltip
2018-04-08 23:54:04 +02:00
Laurent Destailleur
58bc3e5e74
FIX Ref of supplier invoice in stats page
2018-04-08 23:38:54 +02:00
Frédéric FRANCE
b20fc6c816
Update actions_mymodule.class.php
2018-04-08 14:05:44 +02:00
Laurent Destailleur
f388e235fd
Fix filter on account
2018-04-08 13:42:39 +02:00
Laurent Destailleur
99ed9c4589
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/card.php
htdocs/compta/facture/list.php
2018-04-08 13:10:10 +02:00
Laurent Destailleur
a09681f943
Fix css
2018-04-08 13:02:25 +02:00
Laurent Destailleur
79af10fc83
Fix search filters
2018-04-08 13:01:42 +02:00
Laurent Destailleur
3d36e3ee49
Fix search criteria in bookkeeping table
2018-04-08 12:41:03 +02:00
Laurent Destailleur
560c84be0d
FIX When clearing filter, we must not save tmp criterias in session
2018-04-08 12:40:19 +02:00
Laurent Destailleur
8cca3dabd6
FIX look and feel v7 "back to" for bookkeeping record
2018-04-08 11:29:30 +02:00
Laurent Destailleur
6529043182
Clean code
2018-04-08 10:49:59 +02:00
Laurent Destailleur
aad99bdcc0
FIX Removed error when no error on accounting setup page
2018-04-07 22:27:42 +02:00
Laurent Destailleur
165ee9598a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/bank/bankentries_list.php
2018-04-07 21:52:51 +02:00
Laurent Destailleur
304adff973
FIX view of balance before field
...
Conflicts:
htdocs/compta/bank/bankentries_list.php
2018-04-07 21:49:59 +02:00
Laurent Destailleur
893adae346
FIX view of balance before field
2018-04-07 21:45:06 +02:00
Laurent Destailleur
419b225120
Clean code
2018-04-07 21:11:58 +02:00
Laurent Destailleur
d7d9c8c338
Fix module descriptor of dav module
2018-04-07 21:04:08 +02:00
Laurent Destailleur
989d1c87c6
Fix link to reconcile
2018-04-07 20:06:19 +02:00
Laurent Destailleur
bacee3c298
Translation
2018-04-07 20:06:14 +02:00
Laurent Destailleur
88890cf9f4
Fix link to reconcile
2018-04-07 20:03:59 +02:00
Laurent Destailleur
b801a465f5
Translation
2018-04-07 19:42:47 +02:00
Laurent Destailleur
98b9f6bb47
DAV module
2018-04-07 19:12:41 +02:00
Laurent Destailleur
f659b62316
CSS
2018-04-07 17:14:23 +02:00
Laurent Destailleur
4d94327ead
Look and feel v8
2018-04-07 16:17:40 +02:00
Laurent Destailleur
4d2d9193b9
Work on VAT reports to use option MAIN_INFO_VAT_RETURN
2018-04-07 15:47:13 +02:00
Laurent Destailleur
259f3b3020
Add hidden option MAIN_SHOW_ALL_FILES_ON_DOCUMENT_TOOLTIP
2018-04-07 13:23:26 +02:00
Laurent Destailleur
093c367609
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/html.formfile.class.php
2018-04-07 13:20:22 +02:00
Laurent Destailleur
5a34a22934
Code comment
2018-04-07 13:04:52 +02:00
Laurent Destailleur
d46a8eb8f0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/company.php
2018-04-07 12:30:30 +02:00
Laurent Destailleur
15c7bbf9d8
Fix input lost when error
2018-04-07 12:28:10 +02:00
Alexandre SPANGARO
741a14993a
NEW Add file number in accountant card and update export filename
2018-04-07 06:21:49 +02:00
Laurent Destailleur
d5089f2099
Fix default value of sales tax is used must be set in creation
2018-04-06 20:55:02 +02:00
Laurent Destailleur
9e89675862
Fix creation of supplier invoice
2018-04-06 20:34:12 +02:00
Laurent Destailleur
ee870342ef
Fix navigation/translation
2018-04-06 20:22:20 +02:00
Laurent Destailleur
0abcf5694c
Fix message of discount
2018-04-06 20:18:36 +02:00
Laurent Destailleur
ebb418fe3a
Fix CSRF test
2018-04-06 20:06:05 +02:00
Laurent Destailleur
35d2f0e441
Fix no lose entry when error on survey comment submission
2018-04-06 19:42:59 +02:00
Laurent Destailleur
84426c69e3
Fix not not saved
2018-04-06 19:26:24 +02:00
Laurent Destailleur
77f2b137b5
FIX XSS
2018-04-06 19:23:41 +02:00
Laurent Destailleur
1a321e19c8
FIX XSS in company setup page
2018-04-06 19:12:13 +02:00
Laurent Destailleur
417c07a6e8
Fix REFLECTED XSS
2018-04-06 18:33:51 +02:00
Laurent Destailleur
2d1183cbb7
FIX can bypass the CSRF protection with url with domain inside
2018-04-06 17:58:30 +02:00
Laurent Destailleur
1623fea618
FIX SQL Injection CWE-89
2018-04-06 17:25:22 +02:00
Laurent Destailleur
b412f0b76b
Better interaction to setup email
2018-04-06 16:38:47 +02:00
Laurent Destailleur
85d4f7115b
Better position of the substitution tooltip for emails
2018-04-06 16:16:08 +02:00
Laurent Destailleur
1319bb35fb
Fix phpcs
2018-04-06 14:41:45 +02:00
Laurent Destailleur
99d72dc28c
Debug
2018-04-06 14:30:18 +02:00
Laurent Destailleur
049b9b2a5f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-06 14:19:25 +02:00
Laurent Destailleur
9ba55f0d1f
Debug list of transactions
2018-04-06 14:19:11 +02:00
Laurent Destailleur
8e778df0ff
Debug stripe module
2018-04-06 14:05:07 +02:00
Laurent Destailleur
d3adbdfbbc
FIX Restaure way to have empty entry menu
2018-04-06 14:04:52 +02:00
Laurent Destailleur
b0dc4c6d4a
Merge pull request #8376 from ptibogxiv/patch-18
...
NEW add internal stripe payment page for invoice
2018-04-06 13:40:57 +02:00
Laurent Destailleur
1009a629d9
Try better Fix for #8432
2018-04-06 13:20:09 +02:00
Laurent Destailleur
a886fadc2d
Merge pull request #8493 from aspangaro/8.0-a13
...
NEW Module Assets
2018-04-06 12:41:56 +02:00
Laurent Destailleur
956fc2376d
FIX #8483
2018-04-06 12:27:55 +02:00
Laurent Destailleur
f3e1581ba0
Merge pull request #8483 from hregis/develop_ldap
...
Fix: remove html tags and decode html entities
2018-04-06 11:28:11 +02:00
Laurent Destailleur
9ce5d02fde
Merge pull request #8517 from bafbes/master700
...
define module part to include external modules menus
2018-04-06 11:26:23 +02:00
Laurent Destailleur
151245a5e4
Update conf.class.php
2018-04-06 11:25:48 +02:00
François J
a78c064461
Fix CommandeFournisseur::getDispachedLines line ID & return quantity
2018-04-06 11:22:15 +02:00
Laurent Destailleur
e20585daed
Merge pull request #8505 from OPEN-DSI/fix-supplier-order-get-dispatched-line-id-add-quantity
...
FIX CommandeFournisseur::getDispachedLines line ID & return quantity
2018-04-06 09:17:51 +02:00
Laurent Destailleur
e7d69b18bd
Merge pull request #8504 from ATM-Nicolas/develop
...
NEW : Add link between credit note invoice and origin
2018-04-06 09:15:02 +02:00
Regis Houssin
b43aca0f8d
Fix: use dol_string_nohtmltag instead (with strip_tags)
2018-04-06 08:52:02 +02:00
Regis Houssin
c5cf2e4d50
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2018-04-06 08:13:37 +02:00
Alexandre SPANGARO
3e66f5e25b
Update works
2018-04-06 06:04:03 +02:00
Laurent Destailleur
2524a699eb
Standardize file name of lists
2018-04-06 00:36:52 +02:00
Laurent Destailleur
723ac6fba0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-06 00:02:06 +02:00
Laurent Destailleur
920891ba70
Fix edit of default opportunit percent
2018-04-06 00:01:24 +02:00
Alexandre SPANGARO
06dc70df09
Merge remote-tracking branch 'uptream/develop' into 8.0-a13
2018-04-05 20:42:28 +02:00
Alexandre SPANGARO
619805c7a5
Update works
2018-04-05 20:40:41 +02:00
Laurent Destailleur
658e1224d1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-05 19:53:09 +02:00
Laurent Destailleur
48ff89c63b
Fix regression
2018-04-05 19:52:54 +02:00
Laurent Destailleur
2207e5e470
Fix tooltip
2018-04-05 19:23:36 +02:00
TuxGasy
47dcc0d5c6
fix notrigger ignored on BILL_CREATE
2018-04-05 18:32:41 +02:00
Laurent Destailleur
9892a97424
Merge pull request #8509 from tuxgasy/5.0_notrigger_BILL_CREATE
...
fix notrigger ignored on BILL_CREATE
2018-04-05 18:27:45 +02:00
Laurent Destailleur
2d547abaa9
Merge pull request #8498 from atm-john/New_import_lines_from_linked_element
...
New import lines from linked element
2018-04-05 18:26:47 +02:00
Laurent Destailleur
6c409b2670
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-05 18:08:19 +02:00
John
57db0d2a16
Add hidden conf
2018-04-05 17:26:08 +02:00
John
b02f34b038
Add line edit progress test
2018-04-05 17:13:45 +02:00
Laurent Destailleur
ba7261bf0c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-05 16:44:13 +02:00
Laurent Destailleur
d55657951d
Merge pull request #8503 from ruistrecht-alt/FIX_pictos_in_agenda
...
FIX: img_pictos for remove assigned user in agenda card
2018-04-05 16:42:40 +02:00
Laurent Destailleur
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list
...
NEW: generalize use of button to create new element from list
2018-04-05 16:40:15 +02:00
Laurent Destailleur
b59d8a6473
Merge pull request #8501 from ATM-Consulting/develop_atm
...
NEW: send mails from project card
2018-04-05 16:39:06 +02:00
Laurent Destailleur
8cf56a5b9c
Fix regression
2018-04-05 16:29:37 +02:00
bahfir abbes
16ae46e64c
define module part to include external modules menus
2018-04-05 15:23:17 +01:00
Laurent Destailleur
dfa37be7e9
Merge pull request #8499 from atm-maxime/7.0
...
FIX service creation, right is tested regarding the product type
2018-04-05 16:21:06 +02:00
Laurent Destailleur
55719cd166
Update card.php
2018-04-05 16:20:50 +02:00
Laurent Destailleur
3dbe200163
Merge pull request #8497 from ruistrecht-alt/FIX_missing_closing_parentheses
...
FIX: missing closing parentheses
2018-04-05 16:18:12 +02:00
Laurent Destailleur
d19514fd99
Merge pull request #8496 from hregis/develop_bug5
...
Fix: multiple avoid Warning and errors
2018-04-05 16:16:48 +02:00
Laurent Destailleur
92cd314c0f
Fix to avoid warning
2018-04-05 16:16:41 +02:00
Laurent Destailleur
dd934c89bf
Merge pull request #8507 from frederic34/patch-2
...
Translation of error message
2018-04-05 16:12:36 +02:00
Laurent Destailleur
5b50b8bd40
Merge pull request #8491 from hregis/develop_multicompany
...
Fix: possibility to change entity for new thirdparty
2018-04-05 16:11:53 +02:00
Laurent Destailleur
ab27b105c0
Merge pull request #8490 from hregis/7.0_bug6
...
FIX limit access of email template page to internal users
2018-04-05 16:11:04 +02:00
Laurent Destailleur
533de639ae
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/hookmanager.class.php
2018-04-05 13:29:27 +02:00
Laurent Destailleur
45d074c39d
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-05 13:25:59 +02:00
Laurent Destailleur
bdf7d648c9
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-04-05 13:24:53 +02:00
Laurent Destailleur
eeb2d5a4da
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/core/class/extrafields.class.php
htdocs/cron/list.php
2018-04-05 13:24:36 +02:00
Laurent Destailleur
1b1a8f7e81
Fix trigger name
2018-04-05 13:21:00 +02:00
Laurent Destailleur
2b135dc951
FIX #8488
2018-04-05 13:13:45 +02:00
Laurent Destailleur
28b00fc021
Merge pull request #8486 from hregis/develop_email
...
Fix: avoid space in email address
2018-04-05 13:12:03 +02:00
Laurent Destailleur
08ab67289b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/societe/class/societe.class.php
2018-04-05 13:10:11 +02:00
Regis Houssin
5914bfdf18
Fix: more complete
2018-04-05 13:00:55 +02:00
Regis Houssin
156d26ddb9
Fix: backward compatibility
2018-04-05 13:00:50 +02:00
Laurent Destailleur
9dba68de08
Merge pull request #8484 from hregis/develop_member
...
FIX backward compatibility
2018-04-05 13:00:29 +02:00
Laurent Destailleur
af6ab27b23
Merge pull request #8481 from grandoc/develop
...
cleaning code
2018-04-05 12:45:10 +02:00
Laurent Destailleur
0223d54107
FIX Support or multicompany for sheduled jobs
...
FIX Use priority to define order of sheduled jobs
Conflicts:
htdocs/cron/list.php
2018-04-05 12:38:42 +02:00
Laurent Destailleur
0de65b7822
FIX Support or multicompany for sheduled jobs
...
FIX Use priority to define order of sheduled jobs
2018-04-05 12:36:14 +02:00
Laurent Destailleur
88b3e08b22
FIX filter/sorting on extrafield on contact list from contact tab
2018-04-05 11:34:26 +02:00
John
689b3e3b64
Fix outing invoice ligne progress
2018-04-05 11:25:11 +02:00
florian HENRY
cc0fb830b8
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser
2018-04-05 10:53:17 +02:00
John
b37a2f17bf
Fix credit note update on remove from cycle action
2018-04-05 10:48:20 +02:00
John
e966d11356
Fix credit note card apparence
2018-04-05 09:46:55 +02:00
TuxGasy
e5664f9630
fix notrigger ignored on BILL_CREATE
2018-04-04 20:32:36 +02:00
Frédéric FRANCE
90957b3a72
Update mails.lang
2018-04-04 16:00:33 +02:00
Frédéric FRANCE
fd6c1f129c
Update CMailFile.class.php
2018-04-04 15:58:24 +02:00
François J
041a21e829
Add tag @since
2018-04-04 14:05:50 +02:00
John
ce24ca08ee
move list of situation table and fix credit note display
2018-04-04 12:33:48 +02:00
François J
9b61272bb7
Fix CommandeFournisseur::getDispachedLines line ID & return quantity
2018-04-04 12:32:49 +02:00
ATM-Nicolas
1719b43909
FIX : Travis
2018-04-04 09:52:10 +02:00
ATM-Nicolas
b9a91c667f
NEW : Add link between credit note invoice and origin
2018-04-04 09:33:59 +02:00
Laurent Destailleur
7c70f9ed03
Fix option STOCK_SUPPORTS_SERVICES
2018-04-03 20:23:47 +02:00
John
299859d0c4
add action to remove from cycle
2018-04-03 17:34:20 +02:00
Marc de Lima Lucio
c2d3e2a701
NEW: generalize button to create object from list, for the remaining lists
2018-04-03 15:28:12 +02:00
John
70321a8b71
add button to remove from cycle
2018-04-03 15:12:44 +02:00
Maxime Kohlhaas
0c3b92f09a
Better fix
2018-04-03 14:53:57 +02:00
Maxime Kohlhaas
39eab6d88d
Fix service creation, right is tested regarding the product type
2018-04-03 14:38:20 +02:00
John
b7681e7249
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_avoir_situation
2018-04-03 14:12:49 +02:00
Rui Strecht
4f9a8d5b0a
img_picto must return fullpath to picto.png
2018-04-03 12:23:26 +01:00
Rui Strecht
e8a700caab
Fixed issue with img_picto no showing icon in agenda assigned users
2018-04-03 12:13:40 +01:00
John
1afe567a01
Fix array parse error
2018-04-03 12:07:19 +02:00
John
d689e88b92
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element
2018-04-03 11:38:12 +02:00
Laurent Destailleur
8595d7621b
Fix POST mut use method POST no GET
2018-04-02 23:30:23 +02:00
Alexandre SPANGARO
2a50e9e6c4
Merge remote-tracking branch 'uptream/develop' into 8.0-a13
2018-04-02 19:54:30 +02:00
Laurent Destailleur
fba40575f7
Remove dead code
2018-04-02 16:39:48 +02:00
Rui Strecht
09f8a21773
Argument should be array
2018-04-02 15:30:19 +01:00
Rui Strecht
b39f617863
Added missing parentheses
2018-04-02 15:29:58 +01:00
Alexandre SPANGARO
dd04dae652
Update work
2018-04-02 14:03:12 +02:00
Regis Houssin
ef45983f73
Fix: just add fields if not exists
2018-04-02 10:25:15 +02:00
Regis Houssin
9f7fcdc8bf
Fix: multiple avoid Warning and errors
2018-04-02 10:18:51 +02:00
Alexandre SPANGARO
3779b6ff1c
Update work on assets type
2018-04-02 08:22:26 +02:00
Alexandre SPANGARO
3799713c04
Update works
2018-04-02 06:27:55 +02:00
Alexandre SPANGARO
a5428cc8c7
NEW Module Assets
2018-04-01 21:26:52 +02:00
Regis Houssin
e09c85cfdb
Fix: possibility to change entity for new thirdparty
2018-04-01 13:45:39 +02:00
Regis Houssin
edaa558ef7
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap
2018-04-01 11:50:16 +02:00
Regis Houssin
c720345e6d
Fix: better test
2018-04-01 11:47:10 +02:00
Regis Houssin
20e80a58a8
Fix: limit access to internal users
2018-04-01 11:43:39 +02:00
Laurent Destailleur
2d3a55a6a8
Restore broken confirmation popup
2018-03-31 23:39:08 +02:00
Laurent Destailleur
927d86f27f
Revert "NEW: formconfirm in javascript"
...
This reverts commit 50790d5527
2018-03-31 23:10:12 +02:00
Laurent Destailleur
d21143831c
Clean code
2018-03-31 22:44:32 +02:00
Laurent Destailleur
a9ac7e1f29
Debug inventory module
2018-03-31 19:20:38 +02:00
Laurent Destailleur
43f8834b28
Uniformize code with the new module builder framework
2018-03-31 18:48:27 +02:00
Laurent Destailleur
f5079276fb
Fix use new extrafield array definition.
...
Fix exclude separator from list of fields in lists
2018-03-31 17:52:31 +02:00
Laurent Destailleur
96c73a13f6
Clean code
2018-03-31 16:45:36 +02:00
Laurent Destailleur
84bb4c6ad7
FIX With x extrafields, request for multicompany label was done x times
2018-03-30 19:51:53 +02:00
Marc de Lima Lucio
0366e645d5
NEW: generalize button to create object from list, for most of the lists
2018-03-30 16:54:38 +02:00
Laurent Destailleur
b6e9e0e287
Fix missing hooks
2018-03-30 16:44:58 +02:00
Philippe GRAND
c08015a93a
Merge remote-tracking branch 'upstream/develop' into develop
2018-03-30 16:41:10 +02:00
Laurent Destailleur
34c26dffc7
Use constant for contract line status
2018-03-30 15:46:08 +02:00
Regis Houssin
8c610904ac
Fix: remove multi spaces
2018-03-30 07:36:23 +02:00
Regis Houssin
546f3f8b96
Fix: avoid space in email address
2018-03-30 07:19:42 +02:00
Laurent Destailleur
b3a454033e
Rename parameter
2018-03-29 19:44:38 +02:00
Regis Houssin
34c484dea7
Fix: missing adherent type
2018-03-29 19:16:39 +02:00
Laurent Destailleur
99ada20f6d
Add picto bank
2018-03-29 19:08:51 +02:00
Regis Houssin
0e4d796f88
Fix: more complete
2018-03-29 18:47:53 +02:00
Regis Houssin
38912d6918
Fix: more complete
2018-03-29 18:36:51 +02:00
Regis Houssin
c4ce543294
Fix: backward compatibility
2018-03-29 18:30:31 +02:00
Regis Houssin
443ffe3150
Fix: remove html tags and decode html entities
2018-03-29 17:51:23 +02:00
Marc de Lima Lucio
1cc816ff38
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-29 17:36:30 +02:00
Marc de Lima Lucio
a574712dd2
Merge branch 'NEW_mail_project' of github.com:ATM-Consulting/dolibarr into develop_atm
2018-03-29 17:36:08 +02:00
Laurent Destailleur
0978c8f58b
CSS
2018-03-29 16:07:49 +02:00
Laurent Destailleur
2e22c13062
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-29 15:31:35 +02:00
Laurent Destailleur
fdfcb96176
Fix length of combobox
2018-03-29 15:31:21 +02:00
Philippe GRAND
bad970ff05
cleaning code
2018-03-29 15:04:48 +02:00
Laurent Destailleur
7c394733e4
Merge pull request #8445 from ATM-Consulting/develop_atm
...
NEW: bank reconcile: checkbox to select all bank operations
2018-03-29 14:49:41 +02:00
Laurent Destailleur
a214d0b3d7
Merge pull request #8461 from hregis/develop_multicompany
...
Fix: best visibility of choices
2018-03-29 13:58:30 +02:00
Laurent Destailleur
b5c53e9d76
Merge pull request #8469 from ATM-Marc/NEW_product_default_warehouse
...
NEW: default warehouse field for products
2018-03-29 13:51:37 +02:00
Laurent Destailleur
6d796cfd26
Update llx_product.sql
2018-03-29 13:50:29 +02:00
Laurent Destailleur
03fe0d6b9e
Update 7.0.0-8.0.0.sql
2018-03-29 13:50:08 +02:00
Laurent Destailleur
0e986b8f97
Update societe.class.php
2018-03-29 13:48:09 +02:00
Laurent Destailleur
f2022241e3
Merge pull request #8466 from aspangaro/8.0-a11
...
Add label project in tooltip in customer/supplier list
2018-03-29 13:44:13 +02:00
Laurent Destailleur
af11daf186
Merge pull request #8467 from hregis/develop_bug3
...
Fix: missing encrypt for llx_const
2018-03-29 13:43:53 +02:00
Laurent Destailleur
b12752c9a9
Merge pull request #8463 from hregis/develop_dict
...
Fix: differentiate context "card", "contact" and "agenda
2018-03-29 13:41:27 +02:00
Laurent Destailleur
839ebb428b
Merge pull request #8477 from ggg44473/7.0
...
Fix wrong approve time in expense report
2018-03-29 13:40:33 +02:00
Laurent Destailleur
8881dc4518
Merge pull request #8464 from grandoc/new_branch_27-03-2018
...
New [*use loadLangs for translation files*] and update code
2018-03-29 13:40:02 +02:00
Laurent Destailleur
92cbcd9ccb
Merge pull request #8462 from atm-florian/7.0
...
Fix error log
2018-03-29 13:38:35 +02:00
Laurent Destailleur
d6dd7f87cd
Merge pull request #8468 from hregis/develop_ldap
...
NEW Better performance with openldap
2018-03-29 13:37:34 +02:00
Laurent Destailleur
6ccdb52229
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-29 13:30:22 +02:00
Laurent Destailleur
eee1cd9120
Fix data corrupted by v7
2018-03-29 13:29:23 +02:00
Laurent Destailleur
188e5d286d
Fix statut
2018-03-29 13:28:29 +02:00
Laurent Destailleur
072b6c02c0
FIX Test on mandatory status when closing proposal failed
2018-03-29 13:25:03 +02:00
Laurent Destailleur
34ed6516e4
Fix field disappear
2018-03-29 12:52:35 +02:00
Laurent Destailleur
22d64a2768
Dolibarize module ticket
2018-03-29 12:50:03 +02:00
Laurent Destailleur
a7d472bf7b
Dolibarize module ticket
2018-03-29 12:31:17 +02:00
Laurent Destailleur
ff505ba148
Work on a page dedicated for external frontend (mobile, ...)
2018-03-29 11:34:01 +02:00
Laurent Destailleur
b806b85761
Fix field filtert is set twice
2018-03-29 11:15:50 +02:00
Laurent Destailleur
202cf53bab
Fix phpcs
2018-03-29 09:56:11 +02:00
Marc de Lima Lucio
9ba902504e
FIX: langs
2018-03-29 09:38:16 +02:00
florian HENRY
cc7deb0add
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0
2018-03-29 09:36:05 +02:00
florian HENRY
78812ef826
better error management
2018-03-29 09:35:47 +02:00
Sean Wang
3dd9d47089
Fix wrong approve time in expense report
...
The approve time showed was 8 hours more than the real time.
Checking database turned out that it had the wrong data(+8 hours).
After checking every timezone related settings were correct,
I found that it do twice idate() in setApproved().
Since we have idate() in $sql, we don't need the idate()
at the line 1249.
2018-03-29 14:49:06 +08:00
Laurent Destailleur
39f25c9fc2
Fix phpcs
2018-03-29 08:28:36 +02:00
Laurent Destailleur
1c86eb1c44
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/quarter_report.php
htdocs/core/lib/tax.lib.php
2018-03-29 03:08:01 +02:00
Laurent Destailleur
4a289d10d4
Fix phpcs
2018-03-29 03:02:52 +02:00
Laurent Destailleur
125085acee
Fix name of method to avoid ci errors
2018-03-29 03:01:05 +02:00
Marc de Lima Lucio
913135cb20
FIX: project mail: templates + hide actions when in presend
2018-03-28 17:10:12 +02:00
Marc de Lima Lucio
3aff363998
NEW: mail templates for projects
2018-03-28 17:08:26 +02:00
Marc de Lima Lucio
f5324bb15e
FIX: only send mail from open project
2018-03-28 16:07:02 +02:00
atm-ph
a89983ef5c
Fix error on creating company with external module in 'custom' folder with a file to generate accountancy code
2018-03-28 15:41:10 +02:00
Marc de Lima Lucio
f9bc5bf931
NEW: can send mail from project card
2018-03-28 15:22:47 +02:00
Marc de Lima Lucio
3646374976
NEW: default warehouse field for products + prefill warehouses when dispatching supplier orders
2018-03-28 11:54:21 +02:00
Regis Houssin
6e616e1198
Fix: better performance for openldap
2018-03-28 10:06:00 +02:00
Regis Houssin
63a5ff61ef
Fix: missing encrypt for llx_const
2018-03-28 06:44:17 +02:00
Laurent Destailleur
0edba4b4a7
Manage field showoncombobox
2018-03-27 23:44:49 +02:00
Laurent Destailleur
7a45527983
Generate the foreign key into key.sql file
2018-03-27 23:26:20 +02:00
Laurent Destailleur
56c8ee8978
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-27 23:02:12 +02:00
Laurent Destailleur
6f6395e309
Code comment
2018-03-27 23:01:54 +02:00
Alexandre SPANGARO
c012c330de
Merge remote-tracking branch 'uptream/develop' into 8.0-a11
2018-03-27 21:45:35 +02:00
Alexandre SPANGARO
6e27da605a
Add label project in tooltip in customer/supplier list
2018-03-27 21:41:25 +02:00
Philippe GRAND
5b1efc2227
New [*use loadLangs for translation files*] and update code
2018-03-27 19:30:31 +02:00
Regis Houssin
dec0164ff9
Fix: differentiate "card", "contact" and "agenda
2018-03-27 19:12:01 +02:00
florian HENRY
7635f23d78
Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0
2018-03-27 18:39:56 +02:00
florian HENRY
af7c1d8da1
fix error log
2018-03-27 18:39:18 +02:00
Laurent Destailleur
354ee7d09a
Fix sortorder kept after editing a cron job and going back
2018-03-27 18:24:07 +02:00
Regis Houssin
7d7a006583
Fix: best visibility of choices
2018-03-27 18:12:42 +02:00
Laurent Destailleur
e28307ede4
Merge pull request #8449 from hregis/develop_dict
...
NEW add "moreHtmlRef" hook
2018-03-27 18:07:57 +02:00
Laurent Destailleur
f054380548
Merge pull request #8460 from dolibarr95/patch-42
...
NEW: Add date in goods reception supplier order table
2018-03-27 18:05:41 +02:00
Frédéric FRANCE
299c32d262
Update actions_sendmails.inc.php
2018-03-27 18:02:27 +02:00
Laurent Destailleur
1a473998d0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-27 18:01:34 +02:00
Laurent Destailleur
db70492983
Merge pull request #8458 from frederic34/patch-9
...
FIX Error message not reported when sending emails
2018-03-27 18:01:24 +02:00
Laurent Destailleur
3fa7cdf17f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-27 18:00:29 +02:00
Laurent Destailleur
20eb7015e8
Doxygen
2018-03-27 18:00:17 +02:00
Laurent Destailleur
4c9ccb163c
Remove deprecated way of working. Use context array instead.
2018-03-27 17:58:24 +02:00
Laurent Destailleur
34fae0bd48
Merge pull request #8456 from atm-greg/Fix_bankentries_list
...
FIX sql error using no category
2018-03-27 17:49:01 +02:00
Laurent Destailleur
6b47df6695
Merge pull request #8454 from frederic34/patch-2
...
ignore Return-Path in dkim sign with swiftmailer
2018-03-27 17:48:24 +02:00
Laurent Destailleur
6eca679f68
Merge pull request #8453 from OPEN-DSI/fix-import-insert-foreign-key
...
FIX #7581 Import INSERT foreign key
2018-03-27 17:47:45 +02:00
Laurent Destailleur
d41908e52a
Update import_xlsx.modules.php
2018-03-27 17:46:50 +02:00
Laurent Destailleur
86c4bb23ad
Update import_csv.modules.php
2018-03-27 17:46:28 +02:00
Regis Houssin
2b8fe93fc8
Fix: remove unused global
2018-03-27 17:40:17 +02:00
Regis Houssin
35b6cb750f
Fix: move "moreHtmlRef" hook in "showrefnav" function
2018-03-27 17:36:25 +02:00
Marc de Lima Lucio
7c965cb2c7
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_atm
2018-03-27 17:22:38 +02:00
Bruno Généré
925e0c46dd
BUG - Point of sale - buttons for cheque and CB are not displayed properly when one account is not defined
...
I find out in the point of sale module that when you have an account for CB but not for check than you could use check but not CB.
It seems quite obvious when you look to the previous code that a mistake was done.
This is now fixed I expect.
The workaround for now is to define both default accounts (for check and for CB).
2018-03-27 17:13:25 +02:00
Laurent Destailleur
de28f24570
Merge pull request #8448 from bgenere/patch-1
...
FIX - Point of sale - buttons for cheque and CB are not displayed pro…
2018-03-27 17:09:23 +02:00
Laurent Destailleur
fb2885be45
Module DAV
2018-03-27 16:55:51 +02:00
Laurent Destailleur
b6a0b1ff3e
Module DAV
2018-03-27 16:33:40 +02:00
Laurent Destailleur
3eee68c404
NEW Prototype of a module DAV
2018-03-27 16:18:12 +02:00
Laurent Destailleur
460344fbfb
Traduction
2018-03-27 16:02:06 +02:00
dolibarr95
5a63771c87
Add date
2018-03-27 15:11:42 +02:00
Laurent Destailleur
51cd793d80
Fix log and duplicate vat_by_date function
2018-03-27 14:37:29 +02:00
Laurent Destailleur
f9ee2930e2
FIX Data on income/expense report was always 0
2018-03-27 14:16:59 +02:00
Laurent Destailleur
0b13cd17ac
FIX Some report have data when several chart of accounts exists
...
FIX Detail per account not visible when total < 0
2018-03-27 13:55:10 +02:00
Laurent Destailleur
2b588b9e43
FIX Initial month on report income/expense per predefined group
2018-03-27 13:37:40 +02:00
Laurent Destailleur
930512d9a2
FIX Add a test to avoid to reset binding by error.
2018-03-27 13:08:16 +02:00
Laurent Destailleur
4740c92eb1
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-27 12:47:14 +02:00
Laurent Destailleur
56944115cb
Hide a very dangerous feature. Should be useless.
2018-03-27 12:46:15 +02:00
Laurent Destailleur
dab8dbd671
FIX Binding pages must start on fiscal month not calendar month
2018-03-27 12:31:08 +02:00
Laurent Destailleur
d1e9a4719b
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/customer/index.php
htdocs/accountancy/expensereport/index.php
htdocs/accountancy/supplier/index.php
2018-03-27 12:27:15 +02:00
Laurent Destailleur
a3851ec32a
Sync transifex
2018-03-27 12:23:39 +02:00
Laurent Destailleur
ba4839fa76
FIX The menu "Line bindings" start at the fiscal start month
2018-03-27 12:22:10 +02:00
Laurent Destailleur
98b952b547
FIX Create payment of expense report
2018-03-27 12:09:34 +02:00
Frédéric FRANCE
77fb736ee2
Update actions_sendmails.inc.php
2018-03-27 11:17:40 +02:00
Laurent Destailleur
88939a8469
FIX Draft invoice must be excluded from report
2018-03-27 11:10:12 +02:00
atm-greg
91d6a1b621
fix sql error using no category
2018-03-27 06:40:12 +02:00
Laurent Destailleur
b44e791c0a
Work on vat reports
2018-03-26 21:39:18 +02:00
Frédéric FRANCE
1071ec7e57
ignore Return-Path in dkim sign with swiftmailer
2018-03-26 21:36:03 +02:00
François J
e892089afd
Fix Import INSERT foreign key
...
Check the row referencing this foreign key exists first
instead of always trying to perform an UPDATE.
2018-03-26 17:52:43 +02:00
Laurent Destailleur
26e2d3c4f0
Clean permissions tables
2018-03-26 16:35:50 +02:00
Laurent Destailleur
9f11cf77df
Merge ticket css in main css
2018-03-26 15:45:56 +02:00
Laurent Destailleur
e9c4ae8f01
Add type product/service in type of expense report
2018-03-26 14:52:20 +02:00
Laurent Destailleur
89bf781fe6
FIX Add warning when expense report line not into range
...
FIX Name of user not visible on journalizing expense report payments
FIX Only approved expense report must be journalized
2018-03-26 14:13:40 +02:00
Laurent Destailleur
6efa1560b9
Fix wrapper to image barcode
2018-03-25 19:49:00 +02:00
Laurent Destailleur
b756c4a51e
Upgrade to tcpdf 6.2.17
2018-03-25 19:42:34 +02:00
Laurent Destailleur
5fae930f85
Fix warnings
2018-03-25 19:22:08 +02:00
Laurent Destailleur
73273f68b3
Prepare lib to be a native class
2018-03-25 19:21:00 +02:00
Laurent Destailleur
c50b772b11
Clean duplicate code for payment page. Redirect on common page.
2018-03-25 19:15:55 +02:00
Laurent Destailleur
b2c63a1b4d
Dolibarrize ticket module
2018-03-25 18:45:07 +02:00
Laurent Destailleur
8102ae6705
Work on setup for vat of product payments
2018-03-25 18:25:52 +02:00
Laurent Destailleur
8a3e6a0750
More logical setup behavior
2018-03-25 17:53:32 +02:00
florian HENRY
ffbeb17ec2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser
2018-03-25 17:19:27 +02:00
Laurent Destailleur
852191010a
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-03-25 15:29:11 +02:00
Laurent Destailleur
934d2d8881
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/filefunc.inc.php
2018-03-25 15:27:31 +02:00
Laurent Destailleur
e7edf41e19
More complete error message
2018-03-25 15:21:32 +02:00
Laurent Destailleur
53dde8dc0c
Fix confirmation email for membership payment
2018-03-25 15:00:43 +02:00
Laurent Destailleur
a5dd98701e
Too verbose log
2018-03-25 13:40:22 +02:00
Regis Houssin
180f2a0336
Fix: multi_dir compatibility
2018-03-25 12:56:43 +02:00
Regis Houssin
d5ed29c567
NEW add "moreHtmlRef" hook
2018-03-25 12:13:29 +02:00
Laurent Destailleur
a1b44651e5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-24 18:28:23 +01:00
Laurent Destailleur
6ef1dbbe0f
FIX auto open contract if one result found
2018-03-24 18:28:06 +01:00
Bruno Généré
c2eb04f18d
BUG - Point of sale - buttons for cheque and CB are not displayed properly when one account is not defined
...
I find out in the point of sale module that when you have an account for CB but not for check than you could use check but not CB.
It seems quite obvious when you look to the previous code that a mistake was done.
This is now fixed I expect.
The workaround for now is to define both default accounts (for check and for CB).
2018-03-24 17:50:40 +01:00
Laurent Destailleur
0d563ad0ec
Merge pull request #8444 from hregis/develop_multicompany
...
NEW add printUserListWhere hook
2018-03-24 16:42:57 +01:00
Laurent Destailleur
c85cb7fe0a
Merge pull request #8447 from fappels/7.0_modulbuilder
...
Update on module builder
2018-03-24 16:41:43 +01:00
Laurent Destailleur
0a2db0d745
Merge pull request #8446 from hregis/develop_dict
...
Fix: Parameter must be an array or an object that implements Countable
2018-03-24 16:41:04 +01:00
Laurent Destailleur
d63c8356f4
Merge pull request #8437 from hregis/7.0_bug6
...
Fix: uniformize getEntity('intervention')
2018-03-24 16:36:27 +01:00
Laurent Destailleur
630ed04e17
FIX missing properties in last contract list
2018-03-24 13:15:00 +01:00
Laurent Destailleur
224fa1c03e
Fix external links ko when substitution key are inside domain
2018-03-24 12:48:33 +01:00
Laurent Destailleur
a3c199e9e3
FIX Missing include
2018-03-24 12:48:19 +01:00
Laurent Destailleur
ab9edef3c7
Fix external links ko when substitution key are inside domain
2018-03-24 12:46:52 +01:00
Laurent Destailleur
f9ad2f7fb2
FIX Missing include
2018-03-24 12:10:04 +01:00
Laurent Destailleur
ab4f66009a
Translation
2018-03-24 00:00:35 +01:00
Laurent Destailleur
c864dbd515
Save Stripe customer id when using online member subscription
2018-03-23 23:59:35 +01:00
Laurent Destailleur
c7e93a5a3b
Serious enhancement in auto subscription for member module
2018-03-23 22:49:08 +01:00
Laurent Destailleur
53edb86ffb
Make sending of email for member module ok with new email template archi
2018-03-23 19:35:25 +01:00
Laurent Destailleur
639d8ce9ef
Fix link replacement
2018-03-23 18:11:01 +01:00
Laurent Destailleur
6e32e9961f
Syn transifex
2018-03-23 17:56:35 +01:00
fappels
caa43ae2f6
Make helper methods available for derived classes.
...
Use-case: a module build with modulebuilder can make it's own fetch
method using the helper methods.
2018-03-23 17:35:46 +01:00
John
88fab15c60
Change situation display
2018-03-23 17:12:09 +01:00
Marc de Lima Lucio
50790d5527
NEW: formconfirm in javascript
2018-03-23 16:54:33 +01:00
Laurent Destailleur
83b6dd4cb9
Prepare 7.0.2
2018-03-23 16:17:56 +01:00
Laurent Destailleur
a15abb2ded
Update lang
2018-03-23 16:17:28 +01:00
Laurent Destailleur
c12469860a
Update lang
2018-03-23 16:17:10 +01:00
Laurent Destailleur
7363ae17ee
Move setup of email for module module into email templates
2018-03-23 16:09:46 +01:00
John
6a676ea49e
fix percent
2018-03-23 12:24:47 +01:00
Regis Houssin
47ea5a84fe
Fix: wrong var name
2018-03-23 11:11:14 +01:00
Regis Houssin
2fb0fc39a5
Fix: Parameter must be an array or an object that implements Countable
2018-03-23 11:10:04 +01:00
Marc de Lima Lucio
5c46d62acd
NEW: bank reconcile: checkbox to select all bank operations
2018-03-23 11:04:11 +01:00
Regis Houssin
f330c5ad32
Fix: better compatibility
2018-03-23 10:52:10 +01:00
Regis Houssin
715852569b
NEW add printUserListWhere hook
2018-03-23 10:42:36 +01:00
florian HENRY
11446fb2f7
Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0
2018-03-22 23:26:37 +01:00
florian HENRY
46d2b4d62d
fix security check on fourn card
2018-03-22 23:25:54 +01:00
Laurent Destailleur
9f67bb0aa3
Start 6.0.7
2018-03-22 21:58:24 +01:00
Laurent Destailleur
171ad5dce2
Enhance code for template invoices
2018-03-22 21:42:19 +01:00
Laurent Destailleur
72cedcf9f3
Removed method fetch_prods() and get_each_prod() not used, keep only
...
get_arbo_each_prod() that is better.
2018-03-22 18:01:06 +01:00
Regis Houssin
9cf66e53f6
Fix: wrong module name
2018-03-22 16:39:47 +01:00
Regis Houssin
b5f37301a5
Fix: uniformize getEntity('intervention')
2018-03-22 16:28:00 +01:00
Laurent Destailleur
d6f3fc9fe7
Fix use the getSalesRepresentative function instead of get_users
2018-03-22 16:05:50 +01:00
Laurent Destailleur
aa859f980d
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-22 14:21:17 +01:00
Laurent Destailleur
87815265c8
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-22 14:19:56 +01:00
Laurent Destailleur
a9944e1d23
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
ChangeLog
htdocs/contrat/card.php
2018-03-22 14:19:34 +01:00
Laurent Destailleur
ed2d9f179b
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/contrat/card.php
2018-03-22 14:12:37 +01:00
Laurent Destailleur
9980a5fbd0
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
ChangeLog
2018-03-22 14:08:43 +01:00
Laurent Destailleur
86e496963b
Merge pull request #8081 from atm-maxime/new_salesrep
...
NEW improve way of adding users/sales representative to thirdparty
2018-03-22 14:05:44 +01:00
Laurent Destailleur
99d88b0fa9
Merge pull request #8435 from enstentechnologies/7.0
...
FIX PropalStatusValidatedShort missing in langs/en_US/propal.lang
2018-03-22 14:04:40 +01:00
Laurent Destailleur
0bb7d4d494
Update propal.lang
2018-03-22 14:04:33 +01:00
Laurent Destailleur
a7cb811b39
Merge pull request #8431 from fappels/7.0_fix_products_translation
...
Fix products translation
2018-03-22 13:51:37 +01:00
vabeltran
3793fd69e6
FIX PropalStatusValidatedShort missing in langs/en_US/propal.lang
...
Added PropalStatusValidatedShort value, missing in lang/en_US/propal.lang file.
2018-03-22 13:18:06 +01:00
Laurent Destailleur
658b145ff4
Missing translation
2018-03-22 13:16:38 +01:00
Laurent Destailleur
68a4058387
Fix translation
2018-03-22 13:03:12 +01:00
Laurent Destailleur
700c69e127
NEW Can set position of images in module tickets
...
Mutualize code of method show_photo
2018-03-22 11:46:35 +01:00
John
b4983d0e6d
FIX invoice filter
2018-03-22 11:37:16 +01:00
John
fd86e90df2
Add create creadit note btn
2018-03-22 11:19:39 +01:00
fappels
3765bc4775
Fix html escape for edit label
2018-03-22 10:48:03 +01:00
fappels
9e4a66b1a9
Fix hidden oprion PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION
2018-03-22 10:46:54 +01:00
Laurent Destailleur
6e52c896f2
Dolibarrize module ticket
2018-03-22 10:46:42 +01:00
Laurent Destailleur
3b55049895
Dolibarrize module ticket
2018-03-22 10:23:25 +01:00
Laurent Destailleur
227b830aa2
Fix visible rounding of abandonned amount
2018-03-22 09:41:30 +01:00
florian HENRY
4ebb138533
last ones
2018-03-21 23:03:22 +01:00
florian HENRY
487ef3b7c9
cealn again
2018-03-21 23:01:20 +01:00
florian HENRY
c8d309e599
clean
2018-03-21 23:00:33 +01:00
florian HENRY
e2e1fae5e6
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser
2018-03-21 22:58:33 +01:00
florian HENRY
d3ae285c0c
finish work
2018-03-21 22:58:17 +01:00
florian HENRY
1feb22ea9c
fix user right on modRessource
2018-03-21 22:24:11 +01:00
Laurent Destailleur
7b6104de38
Merge pull request #8427 from ATM-Consulting/develop_atm
...
NEW: method Form::selectArrayFilter() + use in left menu search
2018-03-21 20:44:44 +01:00
Laurent Destailleur
0cba7fc761
Update main.inc.php
2018-03-21 20:44:32 +01:00
Laurent Destailleur
a54316ef05
Update main.inc.php
2018-03-21 20:43:26 +01:00
Laurent Destailleur
49f7c64f5e
Merge pull request #8422 from dolibarr95/patch-41
...
NEW Add dol_print_phone in thirdparty list page
2018-03-21 20:40:59 +01:00
Laurent Destailleur
10d7e7d289
Merge pull request #8425 from atm-florian/dev_scrunit
...
Dev scrunit
2018-03-21 20:40:01 +01:00
Laurent Destailleur
423bd56646
Merge pull request #8423 from grandoc/new_branch_20_03_2018
...
New [*use loadLangs for translation files*]
2018-03-21 20:39:40 +01:00
Laurent Destailleur
5556986001
Trad
2018-03-21 20:15:21 +01:00
Laurent Destailleur
35938b1942
NEW Variable __ONLINE_PAYMENT_URL__ available in email templates
2018-03-21 20:06:22 +01:00
Laurent Destailleur
b3bb6d88e6
Fix list of leave not complete for a manager
2018-03-21 19:17:42 +01:00
Laurent Destailleur
517301f014
Work on subscription reminder
2018-03-21 16:40:09 +01:00
Marc de Lima Lucio
08fcd67e0f
FIX: travis
2018-03-21 16:23:28 +01:00
Marc de Lima Lucio
744c263c6c
NEW: selectArrayFilter() + use in left menu search
2018-03-21 15:08:20 +01:00
Laurent Destailleur
200fd88132
Fix output message in log rotation job
2018-03-21 13:56:24 +01:00
Laurent Destailleur
7e5c3cc807
Code comment
2018-03-21 13:30:30 +01:00
Laurent Destailleur
42b0a22df2
Use font-awsome for play icon
2018-03-21 13:16:05 +01:00
atm-ph
2094c48b7f
Fix missing folder with multientity
2018-03-21 12:14:04 +01:00
atm-ph
cad7bdc74b
Fix documents are lost if we rename contrat ref
2018-03-21 11:54:25 +01:00
florian HENRY
dc6f4c1f4d
NEW : option to send email to salaries
2018-03-21 11:48:30 +01:00
Laurent Destailleur
ff0ad94035
Stripe customer info are linked to thirdparty too on payment for member
...
module.
2018-03-21 11:45:35 +01:00
Laurent Destailleur
a2b9dbfbe3
Fix list must show only employee
2018-03-21 11:13:28 +01:00
Laurent Destailleur
e51eb4ae1c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-21 11:00:28 +01:00
Laurent Destailleur
891ebc0e7c
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-21 10:59:59 +01:00
Laurent Destailleur
04199c2b4b
Fix according to mail of Olivier Geffroy the 21th of march
2018-03-21 10:59:13 +01:00
Laurent Destailleur
857bb6c6ee
Css
2018-03-21 10:53:15 +01:00
dolibarr95
4b0eede1dd
Delete getCountry() and select field in sql query
...
Delete getCountry() and select field in sql query
2018-03-21 08:53:38 +01:00
florian HENRY
d959905e4f
fix scrutinizer
2018-03-21 08:35:03 +01:00
Laurent Destailleur
fc50fcd59e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-20 20:07:24 +01:00
Laurent Destailleur
ac35acb273
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-20 20:04:20 +01:00
Laurent Destailleur
fe53ff56ee
FIX Error management in leave request
2018-03-20 20:03:44 +01:00
Philippe GRAND
0d7ffefc8f
New [*use loadLangs for translation files*]
2018-03-20 19:47:25 +01:00
Laurent Destailleur
11d33c8dcc
Merge pull request #8420 from hregis/7.0_bug3
...
Fix: better compatibility with all hostname syntax
2018-03-20 17:32:14 +01:00
Laurent Destailleur
a3a416aa7a
Can remove comment added due to lack of test
2018-03-20 16:46:09 +01:00
Laurent Destailleur
d647bf23d6
Css
2018-03-20 15:05:36 +01:00
Laurent Destailleur
d7ad899839
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/conf.class.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/holiday/list.php
2018-03-20 14:52:27 +01:00
Laurent Destailleur
78b4492f1e
FIX Permission in list of holiday
...
Conflicts:
htdocs/holiday/list.php
2018-03-20 14:46:46 +01:00
Laurent Destailleur
8214e7bb42
Fix missing security restiction test
2018-03-20 14:32:24 +01:00
Laurent Destailleur
a12f884a7f
FIX Permission in list of holiday
2018-03-20 14:31:33 +01:00
Laurent Destailleur
ca7122fe28
Fix responsive
2018-03-20 14:30:02 +01:00
Laurent Destailleur
76cceb59a9
Nead perm to read all for monthly report of leave requests
2018-03-20 13:54:52 +01:00
Laurent Destailleur
2fd212a560
NEW Report a list of leave requests for a month
2018-03-20 13:42:59 +01:00
Laurent Destailleur
67483eeb64
NEW Report a list of leave requests for a month
2018-03-20 13:42:29 +01:00
Laurent Destailleur
1fdad9182f
Fix missing security restiction test
2018-03-20 11:47:58 +01:00
Laurent Destailleur
896a1cbc24
Fix bad var init
2018-03-20 11:27:47 +01:00
Laurent Destailleur
29775f735b
Option MAIN_EXTRAFIELDS_IN_ONE_TD is now 1
2018-03-20 11:26:41 +01:00
dolibarr95
9887d38589
Add dol_print_phone
...
Add dol_print_phone in thirdparty table list.
2018-03-20 11:13:02 +01:00
Laurent Destailleur
8cf2d4eb45
Fix filter on holiday statut
...
Fix tr/td balance for extrafields on lines
2018-03-20 10:10:21 +01:00
Laurent Destailleur
a325bbf865
FIX Input of holiday for subordinates was ko
2018-03-19 20:46:43 +01:00
Laurent Destailleur
7948359bf7
Unlink picto differs from delete picto
2018-03-19 19:08:35 +01:00
Laurent Destailleur
0dc8d3cb00
Fix trad
2018-03-19 18:53:33 +01:00
Regis Houssin
4767819b7a
Fix: better compatibility with all hostname syntax
2018-03-19 17:59:23 +01:00
Laurent Destailleur
0c45760dd4
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/install/step5.php
htdocs/langs/en_US/holiday.lang
htdocs/public/payment/newpayment.php
htdocs/public/stripe/newpayment.php
2018-03-19 17:58:19 +01:00
Laurent Destailleur
14e80948b8
FIX approval date was not visible if leave was canceled after
2018-03-19 17:53:33 +01:00
Laurent Destailleur
ee3dcb724f
FIX email use the validate user instead of approver in holiday approval
...
email.
2018-03-19 17:20:44 +01:00
Laurent Destailleur
73eba91756
Fix translation of email message
2018-03-19 17:06:59 +01:00
Laurent Destailleur
91cc3d1b73
FIX navigation and filters on holiday list
2018-03-19 16:11:42 +01:00
John
f91fe41f45
prepare invoice selection and calculation
2018-03-19 15:50:56 +01:00
Laurent Destailleur
e0164884ee
Better management of hidden option HOLIDAY_HIDE_BALANCE
2018-03-19 15:13:36 +01:00
Laurent Destailleur
eb03fb7540
Fix trad/compatibility
2018-03-19 15:00:50 +01:00
Laurent Destailleur
ac9ab7b228
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-19 14:10:17 +01:00
Laurent Destailleur
8889e7f4b2
FIX translation of holiday types
2018-03-19 14:09:44 +01:00
Laurent Destailleur
7272ee806e
Fix field not mandatory
2018-03-19 12:55:13 +01:00
Laurent Destailleur
ae17ce6f9a
NEW Add a tab to specify accountant/auditor of the company
2018-03-19 12:52:09 +01:00
Laurent Destailleur
91b3ffc3da
Merge pull request #8409 from aspangaro/8.0-a10
...
NEW Add a tab to specify accountant/auditor of the company
2018-03-19 12:40:44 +01:00
Laurent Destailleur
eb7886ecff
Update ldap.class.php
2018-03-19 12:37:53 +01:00
Laurent Destailleur
1837d6a5f3
Better look of lines
2018-03-19 12:30:48 +01:00
Laurent Destailleur
12068f9cf3
Merge branch 'develop' into 8.0-a7
2018-03-19 12:18:18 +01:00
Laurent Destailleur
2ae1bb26c5
Update compta.lang
2018-03-19 12:14:43 +01:00
Laurent Destailleur
c3cd2ff3db
Update objectline_view.tpl.php
2018-03-19 12:13:18 +01:00
Regis Houssin
890d0b6685
Fix: replace ldaps:// by ssl://
2018-03-19 12:11:59 +01:00
Laurent Destailleur
6f7098d22e
Update objectline_view.tpl.php
2018-03-19 12:09:38 +01:00
Laurent Destailleur
928d428956
Merge pull request #8412 from atm-florian/dev_scrunit
...
fix scrutinizer
2018-03-19 12:08:14 +01:00
Laurent Destailleur
5a98958280
Update adherent.class.php
2018-03-19 12:07:08 +01:00
Laurent Destailleur
ce3975377d
Link to unlink is unlink and not remove
2018-03-19 12:02:49 +01:00
Laurent Destailleur
e91ffa00eb
NEW Can crop image files attached in "document" tabs of a member
2018-03-19 11:56:04 +01:00
Laurent Destailleur
f46df6d8e5
Can resize and crop images in the ticketsup module
2018-03-19 11:49:05 +01:00
Laurent Destailleur
f8ca4b1b5c
NEW Add option BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD
2018-03-19 11:34:48 +01:00
Laurent Destailleur
0013e9d83b
FIX Make a redirect after the remove_file action to avoid deletion done
...
at next action too.
2018-03-19 11:29:36 +01:00
Laurent Destailleur
5db718448f
Delete at end
2018-03-19 11:29:06 +01:00
Laurent Destailleur
8899b511fd
FIX Make a redirect after the remove_file action to avoid deletion done
...
at next action too.
2018-03-19 11:28:55 +01:00
Laurent Destailleur
6ca40bcbd4
Fix translation
2018-03-19 11:01:44 +01:00
Laurent Destailleur
9aa4a90543
NEW Stripe online payments reuse the same stripe customer account
2018-03-19 10:57:19 +01:00
Laurent Destailleur
8e72ddc89b
FIX missing email of customer in stripe info payments
2018-03-19 10:18:03 +01:00
Laurent Destailleur
39228f6221
South africa vat rates
2018-03-18 23:37:46 +01:00
Laurent Destailleur
8223047d4a
South africa vat rates
2018-03-18 23:37:28 +01:00
Laurent Destailleur
6a6cf956b1
FIX update of nb of period of loan
2018-03-18 23:32:06 +01:00
Laurent Destailleur
7e488c7ccd
Trans
2018-03-18 22:11:30 +01:00
Laurent Destailleur
9c221c10aa
Load trans
2018-03-18 21:04:16 +01:00
Laurent Destailleur
8e50e63243
Fix translation
2018-03-18 20:32:18 +01:00
Laurent Destailleur
e55c90b015
Fix translation
2018-03-18 20:29:36 +01:00
Laurent Destailleur
99ac06b0b8
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-18 20:22:22 +01:00
Laurent Destailleur
b4881645d8
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/lib/functions.lib.php
2018-03-18 20:21:59 +01:00
Laurent Destailleur
1bb4f3e07a
Dolibarrize module ticket
2018-03-18 20:20:10 +01:00
Laurent Destailleur
af44af0235
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-18 20:01:27 +01:00
Laurent Destailleur
51b6723b08
Dolibarrize module ticket
2018-03-18 20:01:11 +01:00
Laurent Destailleur
d4ae0395ed
NEW Look and feel v8: Use a different picto for delete and unlink
2018-03-18 19:13:42 +01:00
Laurent Destailleur
09beb9186e
Merge pull request #8403 from atm-maxime/develop
...
New filter on product supplier price import update
2018-03-18 14:18:20 +01:00
Laurent Destailleur
0dd33440d1
Merge pull request #8397 from hregis/7.0_bug3
...
Fix: missing update of $conf
2018-03-18 12:29:58 +01:00
Laurent Destailleur
0c1e0f38d8
Merge pull request #8404 from OPEN-DSI/project_add_close_to_mass_update
...
NEW Add mass action on project's list to close projects
2018-03-18 12:28:03 +01:00
Laurent Destailleur
6861dab49e
Merge pull request #8401 from all3kcis/patch-6
...
Add batch status
2018-03-18 12:22:34 +01:00
Laurent Destailleur
22210446da
Merge pull request #8407 from joseplluis/develop
...
FIX: add contact permission on contact box
2018-03-18 12:19:09 +01:00
Laurent Destailleur
e3c0fcc3a0
Merge pull request #8405 from grandoc/develop
...
New [*use loadLangs for translation files*]
2018-03-18 12:17:13 +01:00
Josep Lluís
b2a4e3d023
Error in fix
2018-03-18 08:20:43 +01:00
Alexandre SPANGARO
17b98b84ad
Merge remote-tracking branch 'uptream/develop' into 8.0-a10
2018-03-18 06:11:05 +01:00
Alexandre SPANGARO
93b087dbe0
NEW Add a tab to specify accountant/auditor of the company
2018-03-18 06:09:50 +01:00
Josep Lluís
bd81487f71
FIX: add contact permission on contact box
...
In contact box is only checked the "societe" permission.
Contact permission should be checked too.
2018-03-17 19:35:34 +01:00
Laurent Destailleur
7b71e29fa0
Duplicate translation
2018-03-17 15:17:35 +01:00
Laurent Destailleur
cb1069cf0b
Use font-awesome for the picto to move/transfer a line
2018-03-17 13:21:27 +01:00
Laurent Destailleur
dc0fc73931
Code comment
2018-03-17 12:15:32 +01:00
Laurent Destailleur
57e2240354
NEW Edit of extrafields position page on the edit form
2018-03-17 11:21:50 +01:00
Laurent Destailleur
cfeb0dccfe
Better support for MAIN_AUTHENTICATION_POST_METHOD
2018-03-16 19:29:22 +01:00
Laurent Destailleur
e323084cf8
Better template
2018-03-16 19:03:16 +01:00
Regis Houssin
c0a6ae2195
Fix: replace with dolibarr_install_syslog
2018-03-16 18:31:11 +01:00
Laurent Destailleur
2bbf738cb8
FIX Sql escape
2018-03-16 18:20:28 +01:00
Philippe GRAND
68b1e5f8fd
New [*use loadLangs for translation files*]
2018-03-16 17:40:19 +01:00
florian HENRY
9cd5fabba8
fix scrutinizer
2018-03-16 16:51:24 +01:00
Laurent Destailleur
1a70e7a7c4
Triggers for Strips payment modes
2018-03-16 16:42:26 +01:00
Laurent Destailleur
f258d31a98
Triggers for Strips payment modes
2018-03-16 16:10:04 +01:00
philippe-opendsi
452c9e22bb
Add mass action on project's list to close projects
2018-03-16 15:24:49 +01:00
Maxime Kohlhaas
3ccdb4d829
New filter on product supplier price import update
2018-03-16 14:22:46 +01:00
All3kcis
a7e33150ce
add status batch for getNomUrl
2018-03-16 14:09:38 +01:00
All3kcis
c574a74a2e
Add status batch for getNomUrl
2018-03-16 13:59:04 +01:00
All3kcis
1c0fdcda7a
Add status batch for getNomUrl
2018-03-16 13:57:02 +01:00
Laurent Destailleur
9997a6c787
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/filefunc.inc.php
2018-03-16 12:20:42 +01:00
Laurent Destailleur
bbb095bcb2
FIX css
2018-03-16 12:19:16 +01:00
Laurent Destailleur
07fb29f0c4
Fix var not initialized
2018-03-16 12:18:20 +01:00
Laurent Destailleur
46e8692620
Escape db
2018-03-16 12:17:20 +01:00
Laurent Destailleur
ff765a2efe
FIX Look and feel v7
2018-03-16 12:16:40 +01:00
All3kcis
fd275a636c
Add batch status
...
Add batch status, for correct display with getNomUrl
2018-03-16 11:45:46 +01:00
Laurent Destailleur
96ff5b1b23
Update sql image file for 7.0 stable
2018-03-16 11:19:58 +01:00
arnaud
32ce42610a
FIX show status on societe banner
2018-03-16 11:18:00 +01:00
Laurent Destailleur
e639f2a91f
Removed deprecated method classer_facturee(). Duplicate of
...
classifyBilled
2018-03-16 10:51:12 +01:00
Laurent Destailleur
a642ac60f6
Removed deprecated property $cotisation on membe types
2018-03-16 10:38:09 +01:00
Laurent Destailleur
df5810f678
Add missing supplier proposal contact card
2018-03-16 10:34:06 +01:00
Laurent Destailleur
e2cbf903ba
Remove deprecated code
2018-03-16 10:33:23 +01:00
Laurent Destailleur
ba47b6d051
NEW Add tab contact on supplier proposals
2018-03-16 10:21:53 +01:00
Laurent Destailleur
273e1cdd8d
FIX Look and feel v7
2018-03-16 10:14:14 +01:00
ptibogxiv
a8e5927a6e
FIX lang for support more type of stripeconnect account
2018-03-16 10:07:47 +01:00
Laurent Destailleur
eb5d5d07ec
Remove the old deprecated code of doActions in canvas. The doActions of
...
hooks are already available and are better.
2018-03-16 09:58:46 +01:00
Laurent Destailleur
8bfac66f04
Escape db
2018-03-16 09:52:45 +01:00
Laurent Destailleur
fa1e15af02
Add constant to allow a page to accept a username on a GET parameter
2018-03-16 01:52:07 +01:00
Laurent Destailleur
fe94562a56
Prepare 7.0.1
2018-03-16 01:33:11 +01:00
Laurent Destailleur
545bfeedcc
Minimum PHP version for 8.0 is PHP 5.4
2018-03-16 01:25:34 +01:00
Laurent Destailleur
e118daf4b1
More complete skeleton
2018-03-16 01:12:57 +01:00
Laurent Destailleur
1716ac5f44
Fix var not initialized
2018-03-16 01:05:49 +01:00
Laurent Destailleur
6936d56946
Fix scrutinizer
2018-03-16 01:01:56 +01:00
Laurent Destailleur
32ce7322c4
Debug stripe payment method
2018-03-16 00:45:23 +01:00
Laurent Destailleur
84e1affd5b
Debug stripe payment method
2018-03-16 00:30:03 +01:00
Laurent Destailleur
5a397fff72
Fix scrutinizer bugs
2018-03-16 00:16:32 +01:00
Laurent Destailleur
a94017ba25
FIX letter for month March
2018-03-16 00:07:00 +01:00
Laurent Destailleur
6f95a7c2b1
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-15 23:48:14 +01:00
Laurent Destailleur
ce7da41bef
Fix save setup
2018-03-15 23:47:16 +01:00
Laurent Destailleur
71c51eb789
NEW Add hook printEmail
2018-03-15 22:22:42 +01:00
Laurent Destailleur
46fb2945d4
NEW Show keyboard shortcut of nav arrow into tooltip
2018-03-15 22:02:03 +01:00
Laurent Destailleur
7f8f0c5dc1
Fix parameter silent was inverted
2018-03-15 21:48:51 +01:00
Laurent Destailleur
41f5c43368
NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull
2018-03-15 21:13:19 +01:00
Laurent Destailleur
c962b89495
NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull
2018-03-15 20:46:55 +01:00
Regis Houssin
6e585869c7
Fix: better method for avoid lost global
2018-03-15 19:33:08 +01:00
Regis Houssin
9f62ddaf36
Fix: missing update of $conf
2018-03-15 19:24:34 +01:00
Laurent Destailleur
83962ca70b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-15 18:43:58 +01:00
Laurent Destailleur
e1a0df263d
Fix code with the new return structure of getEmailTemplate
2018-03-15 18:43:47 +01:00
Philippe GRAND
e8df916770
New [*use loadLangs for translation files*]
2018-03-15 17:14:11 +01:00
Laurent Destailleur
c83b0bd53c
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-15 15:11:35 +01:00
Laurent Destailleur
c4ca4a5a16
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/compta/tva/index.php
htdocs/install/mysql/data/llx_accounting_category.sql
2018-03-15 15:11:18 +01:00
Laurent Destailleur
ea3fbf63cd
Merge pull request #8390 from grandoc/new_branch_14_03_2018
...
New [*use loadLangs for translation files*]
2018-03-15 15:07:55 +01:00
Laurent Destailleur
9256faf6fb
Update pdf_merou.modules.php
2018-03-15 15:07:08 +01:00
Laurent Destailleur
c9566e9501
Merge pull request #8392 from aspangaro/8.0-a9
...
NEW Add stats in salaries module
2018-03-15 14:28:35 +01:00
Laurent Destailleur
618627f137
Merge pull request #8393 from atm-maxime/new_siret_check
...
New rule for FR siret value check
2018-03-15 14:27:59 +01:00
Laurent Destailleur
620ceb54e3
Clean code to avoid confusion
2018-03-15 14:25:09 +01:00
Laurent Destailleur
7c62f22408
Remove doubtful code
2018-03-15 14:02:32 +01:00
Laurent Destailleur
ff4d60dd96
Removed no more required hidden option
2018-03-15 14:00:46 +01:00
Laurent Destailleur
ce0144e645
Add code to help debug
2018-03-15 13:21:02 +01:00
Laurent Destailleur
542eb2e5f4
Comment
2018-03-15 13:19:29 +01:00
Laurent Destailleur
85e307d6b8
Fix report when group is not dedicated to a country
2018-03-15 12:31:24 +01:00
Maxime Kohlhaas
3de6e1a6cb
Simplify SIREN check function
2018-03-15 12:02:49 +01:00
Laurent Destailleur
b2e4c6cf14
Clean code
2018-03-15 11:53:47 +01:00
Laurent Destailleur
73005d81a7
FIX country must not be mandatory for accounting report groups
2018-03-15 11:42:59 +01:00
Laurent Destailleur
db18db9488
Clean code
2018-03-15 11:27:39 +01:00
Laurent Destailleur
b379a2f83c
FIX css
2018-03-15 10:43:04 +01:00
Laurent Destailleur
d804764134
Standardize look and feel
2018-03-15 10:41:43 +01:00
Laurent Destailleur
97c8504915
Fix remove log
2018-03-15 10:26:06 +01:00
Maxime Kohlhaas
8ae90bebaf
New rule for FR siret value check
2018-03-15 09:50:33 +01:00
Philippe Grand
c8e672d01a
use $outputlangs instead of $langs
2018-03-15 09:18:40 +01:00
Philippe Grand
3f0764f282
use $outputlangs instead of $langs
2018-03-15 09:17:53 +01:00
Philippe Grand
e6d2effba1
use $outputlangs instead of $langs
2018-03-15 09:15:22 +01:00
Philippe Grand
09d0dc7ba7
use $outputlangs instead of $langs
2018-03-15 09:14:09 +01:00
Philippe Grand
f6fd03a4f3
Change $langs by $outputlangs
2018-03-15 09:06:01 +01:00
Alexandre SPANGARO
9ce6ab915c
Merge remote-tracking branch 'uptream/develop' into 8.0-a9
2018-03-15 06:24:51 +01:00
Alexandre SPANGARO
5eccc6bcbc
NEW Add stats in salaries module
2018-03-15 06:23:20 +01:00
Laurent Destailleur
5392218806
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/core/class/translate.class.php
2018-03-15 02:13:29 +01:00
Laurent Destailleur
c4eea1f0e0
Fix SQLi
2018-03-15 02:12:01 +01:00
Laurent Destailleur
852bf8dab7
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/adherents/card.php
htdocs/societe/class/societe.class.php
2018-03-15 01:57:35 +01:00
Laurent Destailleur
f0f6f71161
Fix Sqli
2018-03-15 01:55:47 +01:00
Laurent Destailleur
4957ea9178
Fix SQLi reported by op7ica
2018-03-15 01:55:16 +01:00
Laurent Destailleur
c3b9c91200
Fix SQLi reported by op7ica
2018-03-15 01:33:46 +01:00
Laurent Destailleur
6a70d268e0
Fix SQLi reported by op7ica
2018-03-15 01:22:32 +01:00
Laurent Destailleur
c62d68f4be
Fix SQLi reported by op7ica
2018-03-15 01:21:44 +01:00
Laurent Destailleur
821a75cef0
Fix payment modes
2018-03-15 00:53:24 +01:00
Laurent Destailleur
f75334f131
Merge pull request #8386 from ptibogxiv/patch-21
...
FIX support for stripeconnect mode
2018-03-15 00:40:52 +01:00
Laurent Destailleur
87bbb4ef87
Can create card from dolibarr
2018-03-15 00:40:29 +01:00
Laurent Destailleur
14a33af603
Merge pull request #8384 from fmarcet/7.0
...
FIX Activate all also if there are inactive services
2018-03-15 00:37:37 +01:00
Laurent Destailleur
c69f5843da
Update card.php
2018-03-15 00:36:56 +01:00
Laurent Destailleur
ffc91bdfdf
Merge pull request #8383 from ggg44473/7.0
...
Add missing $mode in BookKeeping::createStd()
2018-03-15 00:33:37 +01:00
Laurent Destailleur
cca1a58249
Can create card from dolibarr
2018-03-15 00:18:43 +01:00
Laurent Destailleur
3c8c5102c3
Rename var to avoid conflicts
2018-03-14 23:37:14 +01:00
Laurent Destailleur
bf4a0e46aa
Add a credit card on stripe
2018-03-14 21:07:45 +01:00
Laurent Destailleur
302fed8646
More fa image to replace png picto
2018-03-14 20:08:44 +01:00
Philippe GRAND
743a61159d
use loadLangs for translation files
2018-03-14 19:34:33 +01:00
Philippe GRAND
13ce041313
use loadLangs for translation files
2018-03-14 19:26:46 +01:00
Philippe GRAND
a5dc583906
use loadLangs for translation files
2018-03-14 19:10:22 +01:00
Laurent Destailleur
8c535db04c
Use .... before end of card number
2018-03-14 17:15:31 +01:00
Laurent Destailleur
9994b1f133
Work on stripe interface
2018-03-14 17:12:32 +01:00
Laurent Destailleur
b232681318
NEW Add a button to create Stripe customer from the Payment mode tab
2018-03-14 16:53:16 +01:00
Laurent Destailleur
3f7cd8b1bd
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-14 13:56:41 +01:00
Laurent Destailleur
5c2a005e75
Work on generic customer payment modes
2018-03-14 13:56:21 +01:00
fmarcet
5140c1c5d2
Fix: Merge categories when merging thirds
2018-03-14 13:25:05 +01:00
ptibogxiv
e179161bfa
FIX support for stripeconnect mode
2018-03-14 12:01:15 +01:00
Laurent Destailleur
268b07bcf0
Can add/delete credit card localy
2018-03-14 11:51:13 +01:00
ATM-Nicolas
e801b5a431
FIX : Delete tasks on project delete will now trigger TASK_DELETE
2018-03-14 11:38:42 +01:00
Ferran Marcet
4d4a204f7f
Merge remote-tracking branch 'upstream/7.0' into 7.0
2018-03-14 11:11:54 +01:00
Ferran Marcet
e47dda72e7
Fix: Activate all also if there are inactive services
2018-03-14 11:08:38 +01:00
Laurent Destailleur
cc9a6ee6e0
Merge pull request #7428 from ruistrecht-alt/NEW_Show_Region_in_company_info_&_Global_option_to_show_state_code_MAIN_SHOW_STATE_CODE
...
NEW Show region in company info & Global option to show state code MAIN_SHOW_STATE_CODE
2018-03-14 10:49:54 +01:00
Laurent Destailleur
35fbcb2c84
Update company.lib.php
2018-03-14 10:48:56 +01:00
Laurent Destailleur
e7a315958d
Merge pull request #8381 from fmarcet/7.0
...
FIX Can't activate tasks on projects configuration
2018-03-14 10:42:45 +01:00
Ferran Marcet
304595ee4f
Fix: Can't activate tasks on projects configuration
2018-03-14 09:48:39 +01:00
Sean Wang
9a1588df13
Add missing $mode in BookKeeping::createStd()
...
In accountancy ledger, creating new transaction, there is
'ERROR: 55000: currval of sequence "llx_accounting_bookkeeping_rowid_seq"
is not yet defined in this session' occurred.
According to dolibarr.log, this error will show up after
createStd() {...Insert request to llx_accounting_bookkeeping_tmp...}.
It query the "llx_accounting_bookkeeping_rowid_seq" instead of
"llx_accounting_bookkeeping_tmp_rowid_seq",
due to missing $mode at bookkeeping.class.php
line504:last_insert_id().
2018-03-14 16:38:22 +08:00
ptibogxiv
e62df03681
Fix delete customer stripe with new database
2018-03-14 08:59:05 +01:00
Laurent Destailleur
fe68e8acdd
Trans
2018-03-13 22:54:28 +01:00
Laurent Destailleur
da617f7d32
Can work both with remote and local payment modes
2018-03-13 22:43:50 +01:00
Laurent Destailleur
c78e5d23ea
Work on the customer payment mode tab
2018-03-13 20:23:59 +01:00
Laurent Destailleur
a86da671ba
Remove verbose log
2018-03-13 18:13:31 +01:00
Laurent Destailleur
60283a8205
Remove file incoterm.lang
2018-03-13 18:07:58 +01:00
Laurent Destailleur
0258d3aeeb
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-13 18:04:59 +01:00
Laurent Destailleur
ca809a11af
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/commande/class/commande.class.php
2018-03-13 18:04:18 +01:00
ptibogxiv
b3d0b892e5
NEW add internal stripe payment page for invoice
...
WIP: dolibarize with new enhancements and functions
2018-03-13 18:02:36 +01:00
Laurent Destailleur
3f490906f9
Trans
2018-03-13 17:52:15 +01:00
Laurent Destailleur
0a642a2656
Fix regression
2018-03-13 17:49:30 +01:00
Laurent Destailleur
2566170c68
Use code of societeaccount
2018-03-13 17:47:43 +01:00
Laurent Destailleur
944ba69cd8
Add unique key. Dolibarrize view of stripe card.
2018-03-13 17:32:49 +01:00
atm-quentin
af09a3714b
FIX reverse field to have object loaded in doaction
2018-03-13 17:12:03 +01:00
Laurent Destailleur
f88536068f
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-13 15:30:07 +01:00
Laurent Destailleur
17b7c6268e
FIX avoid "Array" on screen
2018-03-13 15:29:52 +01:00
Laurent Destailleur
a955e74329
Better MVC
2018-03-13 15:19:31 +01:00
Laurent Destailleur
9c92e09295
Fix syntax
2018-03-13 14:48:01 +01:00
Laurent Destailleur
f7dd7e89de
Add option to create stripe customer if not found (so we can use
...
function to find without side effect)
2018-03-13 14:44:35 +01:00
Laurent Destailleur
a658f7c455
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-13 14:27:35 +01:00
Laurent Destailleur
b1ac4246a1
Merge pull request #8373 from ptibogxiv/patch-16
...
ADD trigger when modify, delete thirdparty
2018-03-13 14:20:33 +01:00
Laurent Destailleur
59b7187501
Rename interface_99_modStripe_Stripe.class.php to interface_80_modStripe_Stripe.class.php
2018-03-13 14:20:23 +01:00
Laurent Destailleur
4b7f4d29d1
Update interface_99_modStripe_Stripe.class.php
2018-03-13 14:19:26 +01:00
Laurent Destailleur
d6e8872af4
Update interface_99_modStripe_Stripe.class.php
2018-03-13 14:14:33 +01:00
Laurent Destailleur
b25f3ba322
Fix to avoid stripe live mode beeing disabled when stripeconnect off
2018-03-13 14:13:32 +01:00
Laurent Destailleur
4bd05f854c
Merge pull request #8371 from frederic34/pdfaddress
...
add object in pdf_build_address source
2018-03-13 14:04:49 +01:00
Laurent Destailleur
72d4b0dcf9
Merge pull request #8370 from ptibogxiv/patch-15
...
FIX with new database llx_societe_account
2018-03-13 14:02:24 +01:00
Laurent Destailleur
9f07ff0f9b
Fix travis
2018-03-13 14:00:35 +01:00
Laurent Destailleur
e6dd312bd5
Debug ticket module
2018-03-13 13:56:45 +01:00
Laurent Destailleur
e6d8219396
Dolibarrize module ticket
2018-03-13 13:26:03 +01:00
ptibogxiv
3dd90a1f1a
FIX name of file
2018-03-13 13:21:36 +01:00
Laurent Destailleur
4380367923
Error management
2018-03-13 12:54:53 +01:00
ptibogxiv
3aa0bdfe5c
ADD trigger when modify, delete thirdparty
...
More fix todo with new class of stripe.class.php
2018-03-13 12:17:57 +01:00
Frédéric FRANCE
c76dce64d3
add object in pdf_build_address source
2018-03-13 12:15:03 +01:00
Laurent Destailleur
fd249c60da
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-13 12:14:16 +01:00
Laurent Destailleur
8048259733
Work on ticket module integration
2018-03-13 12:13:47 +01:00
ptibogxiv
7feaeb1b89
more FIX for unified stripe's payment class
2018-03-13 12:07:53 +01:00
ptibogxiv
eabc5c0812
FIX with new database llx_societe_account
2018-03-13 11:37:40 +01:00
ptibogxiv
0f15f3c129
Fix database name
2018-03-13 11:27:16 +01:00
Laurent Destailleur
cd71e49762
Picto ticket module
2018-03-13 10:42:58 +01:00
ptibogxiv
4f6f0b302e
FIX for nondisplay of fk_element 's id in REST API response
...
the fk_element don't display when the call is made with REST API (reason non found)
2018-03-13 10:28:44 +01:00
Laurent Destailleur
5d512af4b4
Fix migration
2018-03-13 09:53:33 +01:00
Laurent Destailleur
dcd3387a30
Update commande.class.php
2018-03-13 09:53:21 +01:00
Laurent Destailleur
51229a602f
Update commande.class.php
2018-03-13 09:51:45 +01:00
Laurent Destailleur
c375fd58be
Merge pull request #8366 from ptibogxiv/patch-12
...
ADD key_account variable for stripe or other gateway
2018-03-13 09:40:52 +01:00
Laurent Destailleur
c75cb4167e
Merge pull request #8364 from frederic34/patch-2
...
Update ticketsup.class.php
2018-03-13 09:39:25 +01:00
Laurent Destailleur
490acd96dc
It is better to let the caller decide which mode (live or not) to take
2018-03-13 09:37:59 +01:00
atm-quentin
6c7a5cebdf
FIX check verif exped on delete order
2018-03-13 09:34:50 +01:00
ptibogxiv
d6be9651a0
ADD key_account variable for stripe or other gateway
2018-03-13 00:29:28 +01:00
ptibogxiv
9408a98c52
Fix SQL and ADD support LIVE/TEST mode
2018-03-13 00:26:09 +01:00
Laurent Destailleur
16dc00a7fc
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-12 21:29:34 +01:00
Laurent Destailleur
7b864aeaec
Fix regression with live box
2018-03-12 21:29:03 +01:00
Frédéric FRANCE
08bca60ae2
Update ticketsup.class.php
2018-03-12 20:52:39 +01:00
Frédéric FRANCE
56d023165e
Update ticketsup.class.php
2018-03-12 20:43:38 +01:00
Laurent Destailleur
e6de2ab40e
Merge pull request #8362 from frederic34/patch-9
...
Update CMailFile.class.php for swiftmailer
2018-03-12 20:32:44 +01:00
Laurent Destailleur
a4fd9e83ba
Merge pull request #8361 from frederic34/patch-2
...
Update typo actions_ticketsup.class.php
2018-03-12 20:32:08 +01:00
Laurent Destailleur
717a1daf28
Fix sql injection
2018-03-12 20:26:47 +01:00
Laurent Destailleur
ae5080dab4
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-12 20:16:23 +01:00
Laurent Destailleur
f2bba8fb03
Fix translation
2018-03-12 20:11:34 +01:00
Laurent Destailleur
d045dca003
Fix financial commitment
2018-03-12 20:04:25 +01:00
Laurent Destailleur
8f21f0e265
Fix financial commitment
2018-03-12 20:03:32 +01:00
Laurent Destailleur
bf36d671ba
Fix ticket deletion
2018-03-12 19:30:21 +01:00
Laurent Destailleur
78b0585798
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/taxes.php
2018-03-12 19:09:57 +01:00
Laurent Destailleur
55d3e72463
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/contact/class/contact.class.php
htdocs/societe/card.php
2018-03-12 19:02:30 +01:00
Laurent Destailleur
cbbaf4763b
Start to introduce thirdparty website accounts
2018-03-12 16:04:23 +01:00
Laurent Destailleur
7362b3f3d7
Add table to store thirparty account in external web sites
2018-03-12 15:59:03 +01:00
Frédéric FRANCE
d6e98d3b05
Update CMailFile.class.php
2018-03-12 15:14:41 +01:00
Laurent Destailleur
f40e6e25c6
Move picto
2018-03-12 15:12:58 +01:00
Frédéric FRANCE
cf77ef4f45
Update actions_ticketsup.class.php
2018-03-12 14:16:52 +01:00
Laurent Destailleur
8fa3cf7c6a
Fix setup
2018-03-12 13:39:32 +01:00
Laurent Destailleur
0d1e26b02c
Fix error management
2018-03-12 13:19:09 +01:00
Laurent Destailleur
591b0993af
Fix PHPUnit for Ticket
2018-03-12 12:54:48 +01:00
Laurent Destailleur
0dfaa14d6e
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-12 12:41:54 +01:00
Laurent Destailleur
3dfc94787c
Fix sql injection
2018-03-12 12:41:43 +01:00
Laurent Destailleur
18b6b70f45
Merge pull request #8358 from frederic34/patch-2
...
Update llx_ticketsup.sql
2018-03-12 12:28:40 +01:00
Laurent Destailleur
98b7d4c2e2
NEW Can set the start/end date of service line in invoice templates
2018-03-12 12:27:40 +01:00
Frédéric FRANCE
98320ffad2
Update 7.0.0-8.0.0.sql
2018-03-12 08:36:18 +01:00
Frédéric FRANCE
478b3dfa42
Update llx_ticketsup.sql
2018-03-12 08:34:47 +01:00
Laurent Destailleur
ae82d045f8
Dolibarrize module ticket
2018-03-11 23:56:17 +01:00
Laurent Destailleur
6ac070823f
Fix phpcs
2018-03-11 23:22:55 +01:00
Laurent Destailleur
6da3fbe3c9
Translation
2018-03-11 23:21:14 +01:00
Laurent Destailleur
f1f539d2a7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-11 23:08:10 +01:00
Laurent Destailleur
d1fbf2a80e
Dolibarrize
2018-03-11 23:07:57 +01:00
Laurent Destailleur
cd10ed9308
Merge pull request #8355 from aspangaro/8.0-a8
...
Fix : Remove two langs->load("sendings") and use loadLangs instead
2018-03-11 23:05:10 +01:00
Laurent Destailleur
b965240439
Merge pull request #8353 from frederic34/patch-8
...
Update ticketsup.php
2018-03-11 23:03:45 +01:00
Laurent Destailleur
6d7b7ad4fe
Merge pull request #8352 from frederic34/patch-2
...
Update ticketsup.lang
2018-03-11 23:03:28 +01:00
Alexandre SPANGARO
c0d4ca3682
Fix : Remove two langs->load("sendings") and use loadLangs instead
2018-03-11 22:28:27 +01:00
TuxGasy
34145ed443
Do not display multicurrency cols if currency of object is same as main currency
2018-03-11 21:58:32 +01:00
Laurent Destailleur
93f4d6fdcd
Translation
2018-03-11 21:34:38 +01:00
Laurent Destailleur
51c94fadfa
Look and feel v7
2018-03-11 21:31:34 +01:00
Laurent Destailleur
e1654f4215
Fix division by zero
2018-03-11 21:18:18 +01:00
Frédéric FRANCE
683486eaf1
Update html.formticketsup.class.php
2018-03-11 21:00:39 +01:00
Frédéric FRANCE
ad05ddfe5c
Update ticketsup_extrafields.php
2018-03-11 20:42:39 +01:00
Frédéric FRANCE
111bbd98ce
Update ticketsup.php
2018-03-11 20:36:52 +01:00
Frédéric FRANCE
b04d38e760
Update ticketsup.lang
2018-03-11 20:16:06 +01:00
Laurent Destailleur
b084ca4a50
Fix
2018-03-11 19:44:19 +01:00
Laurent Destailleur
2245a2eaf6
Merge pull request #8351 from hregis/develop_dict
...
Fix: dolibarrizzzz
2018-03-11 19:33:36 +01:00
Laurent Destailleur
21e15e19b0
Merge pull request #8350 from frederic34/patch-2
...
Update ticketsup new.php
2018-03-11 19:33:03 +01:00
Laurent Destailleur
43ac1adbc4
Fix phpcs
2018-03-11 19:32:28 +01:00
Laurent Destailleur
95e7062ca3
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-03-11 19:29:01 +01:00
Laurent Destailleur
d5d6939fd9
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
...
Conflicts:
htdocs/core/class/commonobject.class.php
2018-03-11 19:28:39 +01:00
Laurent Destailleur
a3d25b24d3
FIX #8285 Extrafields now reported by /api/index.php/agendaevents/{id}
2018-03-11 19:27:03 +01:00
Regis Houssin
a09bad6d69
Fix: wrong year
2018-03-11 18:59:45 +01:00
Regis Houssin
ecb44e2f53
Fix: wrong copy/paste
2018-03-11 18:57:36 +01:00
Frédéric FRANCE
da48dc6eab
Update new.php
2018-03-11 18:56:04 +01:00
Regis Houssin
7c3984c9db
Fix: dolibarrizzzz
2018-03-11 18:54:38 +01:00
Laurent Destailleur
6709b0934b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-11 18:35:01 +01:00
Laurent Destailleur
d28680e3ed
Fix phpcs
2018-03-11 18:34:47 +01:00
Laurent Destailleur
43e297b142
Merge pull request #8138 from frederic34/patch-2
...
Update price.php
2018-03-11 18:33:16 +01:00
Laurent Destailleur
8e37957481
Merge pull request #8349 from frederic34/frederic34-patch-1-1
...
Update ticketsup.class.php
2018-03-11 18:31:24 +01:00
Laurent Destailleur
3e187123b0
Merge pull request #8348 from hregis/develop_dict
...
Fix: dolibarrize
2018-03-11 18:30:50 +01:00
Laurent Destailleur
70490e2b4b
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/ticketsup/class/actions_ticketsup.class.php
2018-03-11 18:29:19 +01:00
Laurent Destailleur
8b6dea218b
Dolibarrize module
2018-03-11 18:28:27 +01:00
Frédéric FRANCE
d77bde4721
Update ticketsup.class.php
2018-03-11 18:25:22 +01:00
Regis Houssin
741d69fabe
Fix: dolibarrize
2018-03-11 18:23:02 +01:00
Laurent Destailleur
33dda6c9b8
Merge pull request #8347 from frederic34/patch-7
...
Update ticketsup index.php
2018-03-11 18:19:22 +01:00
Laurent Destailleur
0f4f844ab5
Merge pull request #8346 from hregis/develop_api
...
Fix: travis
2018-03-11 18:16:23 +01:00
Frédéric FRANCE
69f66f998d
Delete .gitignore
2018-03-11 18:13:39 +01:00
Laurent Destailleur
d9b55f2275
Merge branch 'develop' into dev_ticketsup
2018-03-11 18:12:47 +01:00
Frédéric FRANCE
5251a6c72a
Update index.php
2018-03-11 18:12:32 +01:00
Laurent Destailleur
baf6fc6a8b
Merge pull request #8343 from atm-maxime/develop
...
Fix mail send
2018-03-11 18:11:37 +01:00
Laurent Destailleur
0005b1bc48
Merge pull request #8342 from atm-florian/dev_fixscrunitiz
...
fix scrunitizer
2018-03-11 18:11:13 +01:00
Laurent Destailleur
40cf236f92
Merge branch 'develop' into ticketsup_core
2018-03-11 18:10:11 +01:00
Laurent Destailleur
d0598a767c
Merge pull request #8339 from frederic34/patch-4
...
Update ticketsup linkedobjectblock.tpl.php
2018-03-11 18:06:40 +01:00
Laurent Destailleur
d6eee30ee9
Merge pull request #8336 from defrance/patch-106
...
add sql log on install debug
2018-03-11 18:06:18 +01:00
Laurent Destailleur
dea80eba4e
Use a constant name starting with MAIN
2018-03-11 18:06:08 +01:00
Laurent Destailleur
f0a0c8c3e5
Fix phpcs
2018-03-11 17:57:58 +01:00
Regis Houssin
af6f7f6773
Fix: travis
2018-03-11 17:44:47 +01:00
Frédéric FRANCE
435a049960
Create index.html
2018-03-11 17:35:00 +01:00
jfefe
3b814ebba2
Try to fix phpunit test (br tag isuue)
2018-03-11 16:54:39 +01:00
Laurent Destailleur
7ffce2a28f
Dolibarize
2018-03-11 16:48:44 +01:00
jfefe
c3fab4c54c
Fix Phpunit issue
2018-03-11 16:48:26 +01:00
florian HENRY
42bf6fd3dc
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_ticketsup
2018-03-11 16:13:51 +01:00
jfefe
2464fadf03
Merge branch 'develop' into ticketsup_core
2018-03-11 16:11:01 +01:00
florian HENRY
cfdaa7c88d
ticket sup make it work
2018-03-11 16:07:13 +01:00
jfefe
5656e17570
Fix PHPCS errors (ticketsup module)
2018-03-11 16:06:11 +01:00
Laurent Destailleur
e393621f2f
Dolibarrize
2018-03-11 16:00:18 +01:00
Maxime Kohlhaas
df185de6ae
Fix mail send
2018-03-11 15:09:25 +01:00
florian HENRY
6d8566a238
fix scrunitizer
2018-03-11 12:41:48 +01:00
jfefe
0f96575b41
Fix PHPCS errors with ticketsup module
2018-03-11 12:06:57 +01:00
Frédéric FRANCE
26dbd4f3a1
Update linkedobjectblock.tpl.php
2018-03-11 11:43:12 +01:00
Laurent Destailleur
0ac1d8b226
Dolibarize
2018-03-11 11:33:24 +01:00
Laurent Destailleur
e14d2f08b8
Dolibarize
2018-03-11 11:12:38 +01:00
BENKE Charlene
bfaffe6692
Changes Done
2018-03-11 10:51:05 +01:00
Laurent Destailleur
8217587b5e
Dolibarize new module
2018-03-11 10:34:21 +01:00
jfefe
138c842959
Correct bad paths
2018-03-11 09:44:58 +01:00
jfefe
79acb79ae0
Begin integration of module « Ticketsup »
...
Related to #4948
2018-03-11 09:44:58 +01:00
Laurent Destailleur
ce53c8fdb5
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-11 02:21:37 +01:00
Laurent Destailleur
4070d78d13
Fix phpcs
2018-03-11 02:18:46 +01:00
Laurent Destailleur
5d86b8e621
Merge pull request #8337 from atm-florian/dev_fixscrunitiz
...
fix scrunitizer
2018-03-11 02:08:35 +01:00
Laurent Destailleur
7f469e9f6f
Fix PHPCS
2018-03-11 02:04:08 +01:00
Laurent Destailleur
6baafab53c
Fix travis errors
2018-03-11 01:52:40 +01:00
Laurent Destailleur
5edaa9a98c
Fix phpcs
2018-03-11 01:50:15 +01:00
Laurent Destailleur
5b0dd0e31b
Try to fix regression
2018-03-11 01:23:06 +01:00
Laurent Destailleur
5c4b5cc74f
fix
2018-03-11 00:40:35 +01:00
Laurent Destailleur
9ed2e47775
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-11 00:32:41 +01:00
Laurent Destailleur
897b3f7b79
Fix setup
2018-03-11 00:31:26 +01:00
florian HENRY
888afe0e33
fix scrunitizer
2018-03-11 00:25:14 +01:00
Laurent Destailleur
06689bb79f
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-11 00:16:21 +01:00
Laurent Destailleur
64f21b8a3c
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/expensereport/card.php
2018-03-11 00:10:13 +01:00
Laurent Destailleur
f98ca2e31a
Merge pull request #8335 from inoveaconseil/patch-1
...
Fix #8092
2018-03-11 00:06:28 +01:00
Laurent Destailleur
03f7df88c6
Update card.php
2018-03-11 00:05:32 +01:00
Laurent Destailleur
11abbbcd98
Merge pull request #8334 from atm-florian/dev_fixtrigger
...
fix trigger position into explication class
2018-03-11 00:00:43 +01:00
Laurent Destailleur
17d1a15d50
Update expedition.class.php
2018-03-11 00:00:24 +01:00
BENKE Charlene
923bad4da6
add sql log on install debug
...
new global variable INSTALL_DISPLAY_SQL_LOG to display sql log on module install
2018-03-10 23:59:34 +01:00
Laurent Destailleur
0389664b1e
Fix php code
2018-03-10 23:50:41 +01:00
Inovea Conseil
c2397fad60
Fix #8092
2018-03-10 23:49:43 +01:00
florian HENRY
3da645ab3b
fix trigger position into explication class
2018-03-10 23:40:56 +01:00
Maxime Kohlhaas
c008853842
Fix #8057
2018-03-10 23:05:33 +01:00
Laurent Destailleur
390618db47
Fix bad space
2018-03-10 22:42:28 +01:00
Laurent Destailleur
bdb6a09762
Fix phpcs
2018-03-10 22:41:57 +01:00
Laurent Destailleur
72bccd9c6b
Merge branch 'develop' into bug-6980
2018-03-10 22:27:07 +01:00
Laurent Destailleur
dfb3d1b3bc
Merge pull request #8325 from inoveaconseil/develop
...
Add execution date on direct debit
2018-03-10 22:11:58 +01:00
Laurent Destailleur
bb835d3633
Update bonprelevement.class.php
2018-03-10 22:09:32 +01:00
Laurent Destailleur
3a8c216ab6
Merge branch 'develop' into ptibogxiv-stripe
2018-03-10 22:05:18 +01:00
Laurent Destailleur
8aec5cf6fa
Merge pull request #8331 from atm-alexis/NEW_hidden_conf_for_nb_weeks_to_swho
...
NEW hidden conf AGENDA_NB_WEEKS_IN_VIEW_PER_USER to set nb weeks to show into per user view
2018-03-10 21:55:58 +01:00
Laurent Destailleur
6c9e0e1752
Merge branch '7.0' into 7.0
2018-03-10 21:52:57 +01:00
Alexis Algoud
74dc815bfa
fix commonobject isInt for module builder capabilities
2018-03-10 19:02:06 +01:00
Laurent Destailleur
72eff36cd6
Merge pull request #8328 from atm-alexis/FIX_commonObject_isInt_linked
...
Fix commonobject isInt for module builder capabilities
2018-03-10 18:59:12 +01:00
Laurent Destailleur
905cf112e9
Merge pull request #8327 from tiaris/fix7.0
...
FIX #8289
2018-03-10 18:58:22 +01:00
Laurent Destailleur
6fcc271790
Update product.class.php
2018-03-10 18:57:55 +01:00
Laurent Destailleur
f609547bc9
Update bonprelevement.class.php
2018-03-10 18:50:41 +01:00
Laurent Destailleur
9e0c74ca20
Update bonprelevement.class.php
2018-03-10 18:49:48 +01:00
Laurent Destailleur
b2677c35e2
Merge pull request #8317 from frederic34/swifmailer
...
Add dkim signing with Swiftmailer
2018-03-10 18:48:08 +01:00
Laurent Destailleur
aea3c164ba
Merge pull request #8178 from hregis/7.0_bug2
...
Fix: avoid Warning: A non-numeric value encountered
2018-03-10 18:47:11 +01:00
Laurent Destailleur
3911738b88
Fix vulnerability reported by DIGITEMIS CYBERSECURITY & PRIVACY
2018-03-10 18:40:45 +01:00
Laurent Destailleur
e3ace1f89f
Fix morecss not provided
2018-03-10 18:17:54 +01:00
Laurent Destailleur
702c84a100
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-10 17:57:49 +01:00
Alexis Algoud
129c032118
NEW hidden conf to set nb weeks to show into user view
2018-03-10 16:46:57 +01:00
Laurent Destailleur
241b5e9a93
FIX security report DIGITEMIS CYBERSECURITY & PRIVACY
2018-03-10 15:52:11 +01:00
BadPixxel
44d18027f2
BugFix for PHP7.1: PHP Warning: A non-numeric value encountered in /tmp/Dolibarr/htdocs/product/class/product.class.php on line 1709
2018-03-10 15:48:40 +01:00
Inovea Conseil
87b797bdec
Fix unknow field
2018-03-10 15:06:02 +01:00
ptibogxiv
3ea6a9fa5f
Update stripe.php
2018-03-10 15:05:04 +01:00
BadPixxel
836054a8b3
BugFix Issue #8261 : Variants module. Combinations cannot be edited
2018-03-10 14:51:24 +01:00
ptibogxiv
6b43477c39
Update stripe.php
2018-03-10 14:48:07 +01:00
ptibogxiv
5403e7a347
Update stripe.php
2018-03-10 14:46:37 +01:00
ptibogxiv
bbff580fb3
integration of fee's platform
2018-03-10 14:45:07 +01:00
ptibogxiv
dd15dc56dd
Update and fix
...
prepare integration for more callback support
2018-03-10 14:34:10 +01:00
jean
6793bfae3a
FIX #8289 add a cofoiguration for correct stopck calculation
2018-03-10 14:17:52 +01:00
Alexis Algoud
b370a3096c
fix commonobject isInt for module builder capabilities
2018-03-10 14:14:31 +01:00
Laurent Destailleur
96aaeb2fd0
Merge pull request #8326 from atm-florian/dev_fixscrunitiz
...
fix scrunitizer
2018-03-10 12:57:51 +01:00
Laurent Destailleur
b0bd8cf910
Update facture.class.php
2018-03-10 12:56:19 +01:00
Laurent Destailleur
a85a103a55
Merge pull request #8308 from atm-florian/7.0_fixinventory
...
7.0 fixinventory
2018-03-10 12:54:36 +01:00
Laurent Destailleur
212536a3fd
Update list.php
2018-03-10 12:54:20 +01:00
Laurent Destailleur
64f2f324de
Update card.php
2018-03-10 12:52:09 +01:00
Laurent Destailleur
a7f82af352
Update card.php
2018-03-10 12:49:25 +01:00
Laurent Destailleur
f6918a5d88
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2018-03-10 12:47:00 +01:00
Laurent Destailleur
d00b549f91
Remove duplicate perm
2018-03-10 12:46:45 +01:00
Laurent Destailleur
75b470b580
Update eldy.lib.php
2018-03-10 12:43:01 +01:00
Laurent Destailleur
04bcc4dd46
Update eldy.lib.php
2018-03-10 12:39:39 +01:00
Laurent Destailleur
a833c271e1
Missing user
2018-03-10 12:37:44 +01:00
