Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,072 Commits 35 Branches 179 Tags 1.7 GiB
afee39ea68
Commit Graph

63009 Commits

Author SHA1 Message Date
Laurent Destailleur
0451eb741b Work on legal cash fence 2018-12-15 19:20:30 +01:00
Laurent Destailleur
85cd23caaf Fix phpcs 2018-12-15 18:31:36 +01:00
Laurent Destailleur
8ce6f67773 Fix phpcs 2018-12-15 18:27:38 +01:00
Laurent Destailleur
54ffba793f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
	htdocs/langs/en_US/admin.lang
 2018-12-15 18:21:37 +01:00
Laurent Destailleur
944f9ac894 Typo 2018-12-15 18:14:08 +01:00
Laurent Destailleur
527ad04ae8 FIX Mandatory field feature should works on textarea 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-12-15 18:13:30 +01:00
Laurent Destailleur
6188156c52 FIX Mandatory field feature should works on textarea 2018-12-15 18:11:40 +01:00
Laurent Destailleur
33a91ff707 Add missing POS closure feature 2018-12-15 16:47:06 +01:00
andreubisquerra
cdaf048766 First CashControl version 2018-12-15 16:45:36 +01:00
Laurent Destailleur
22c454a8ed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-15 16:44:37 +01:00
Laurent Destailleur
1167d9aecb
Merge pull request #10206 from andreubisquerra/master 
First CashControl version
 2018-12-15 16:44:24 +01:00
Laurent Destailleur
2d1cf59f34
Merge pull request #10204 from andreubisquerra/master 
Improve TakePOS responsive design
 2018-12-15 16:37:51 +01:00
Laurent Destailleur
2a87521da8 Fix phpcs 2018-12-15 16:37:00 +01:00
Laurent Destailleur
cced9d30cf
Merge pull request #10199 from ATM-Nicolas/new_set_first_search_entry 
NEW : Add hidden conf to set a search entry to the top
 2018-12-15 16:21:48 +01:00
Laurent Destailleur
718105ff86 FIX #10196 2018-12-15 16:20:36 +01:00
Laurent Destailleur
8a01944a0c
Update invoice.php 2018-12-15 16:12:47 +01:00
Laurent Destailleur
b7ee2458a3
Update invoice.php 2018-12-15 16:10:44 +01:00
Laurent Destailleur
3032ef1235
Merge branch 'develop' into develop 2018-12-15 16:08:58 +01:00
Laurent Destailleur
25b93fdd3e
Merge pull request #10188 from AlainRnet/patch-7 
Update vcard.php
 2018-12-15 16:01:38 +01:00
Laurent Destailleur
30af82978b
Merge pull request #10189 from aljawaid/aljawaid-rss_new_tab 
NEW: Ensure External RSS Links Open in New Window
 2018-12-15 16:00:31 +01:00
Laurent Destailleur
e80e366fb1
Merge pull request #10187 from AlainRnet/patch-6 
Update vcard.class.php
 2018-12-15 15:59:34 +01:00
Norbert Penel
0f3a063c91 Events are not linked to products 
when created from a product card, the events are not linked to the product
 2018-12-15 15:57:15 +01:00
Laurent Destailleur
2d4403c3bf
Merge pull request #10184 from homer8173/patch-5 
Events are not linked to products
 2018-12-15 15:46:22 +01:00
Laurent Destailleur
2b6269a162
Merge pull request #10171 from hregis/develop_bug 
FIX scrutinizer
 2018-12-15 15:44:27 +01:00
Laurent Destailleur
39d244eeb2 Fix phpcs 2018-12-15 15:43:30 +01:00
Laurent Destailleur
db46d82de3 Fix position of menu entries 2018-12-15 15:35:59 +01:00
Laurent Destailleur
eb66d45947
Merge branch 'develop' into 10.0_accoutancy_stats 2018-12-15 15:17:15 +01:00
Laurent Destailleur
319c571d76
Merge pull request #10125 from defrance/patch-131 
NEW massfilesarea feature for plugin modules
 2018-12-15 15:13:13 +01:00
Laurent Destailleur
2e1b762596 Fix phpcs 2018-12-15 15:07:35 +01:00
Laurent Destailleur
1bce3f6c6b Fix phpcs 2018-12-15 14:54:10 +01:00
Laurent Destailleur
4ff28d4580 Fix phpcs 2018-12-15 14:11:59 +01:00
Laurent Destailleur
f55db6dd84 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/resources/dbmodel/dolibarr_schema.mwb
 2018-12-15 14:09:16 +01:00
Laurent Destailleur
6846d8821d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/tpl/extrafields_list_search_sql.tpl.php
 2018-12-15 14:07:25 +01:00
Laurent Destailleur
2a3b808da6 CSS 2018-12-15 14:05:23 +01:00
Laurent Destailleur
dbc85b42ba Fix phpcs 2018-12-15 13:58:39 +01:00
Laurent Destailleur
c6d76e29f1 Fix phpcs 2018-12-15 13:50:40 +01:00
Laurent Destailleur
cf3e556f6b Fix phpcs 2018-12-15 13:46:46 +01:00
Laurent Destailleur
6761e21921
Update 8.0.0-9.0.0.sql 2018-12-15 12:52:09 +01:00
Laurent Destailleur
27f8096afa
Merge branch 'develop' into PR_NEW_reception 2018-12-15 12:50:31 +01:00
Laurent Destailleur
e069da69ba Revert "Fix screen size fall" 
This reverts commit abb6b41f91.
 2018-12-15 12:35:37 +01:00
John BOTELLA
4fa10296f4 Fix screen size fall 2018-12-15 12:34:41 +01:00
Laurent Destailleur
dbe5d285e8
Merge pull request #9965 from atm-john/fix_responsive 
FIX screen size fall
 2018-12-15 12:33:35 +01:00
Laurent Destailleur
699dc239d4 Fix US trans 2018-12-15 12:24:14 +01:00
Laurent Destailleur
69c666162f
Update projects.lang 2018-12-15 12:13:54 +01:00
Laurent Destailleur
2fafef6b7d
Merge branch 'develop' into lang-en_US 2018-12-15 12:11:22 +01:00
Laurent Destailleur
ec3465e65f
Merge pull request #9995 from delcroip/develop 
Add a link for compta-files.php in the accountancy leftmenue
 2018-12-15 12:09:42 +01:00
Laurent Destailleur
48aa6e9ccf
Update eldy.lib.php 2018-12-15 12:09:13 +01:00
Laurent Destailleur
72f8730ce8
Update eldy.lib.php 2018-12-15 12:08:32 +01:00
Laurent Destailleur
29bd782c8c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-15 11:48:32 +01:00
Laurent Destailleur
b511a056f4 Fix phpcs 2018-12-15 11:48:21 +01:00
torvista
6f5f4bd3de added latest Develop edits 2018-12-14 20:33:07 +01:00
torvista
805c184163 more supplier->vendor found! 
use of e-mail, EMail, Email rationalised
grammar changes for module titles and descriptions
added constants for Stripe to admin to override class constants
 2018-12-14 20:17:22 +01:00
Laurent Destailleur
063e589a1b
Merge branch '8.0' into 8.0_fix9964 2018-12-14 19:37:40 +01:00
Laurent Destailleur
928ccc64eb
Merge pull request #10098 from aljawaid/aljawaid-expense_remainder_pay_amount 
NEW: Add Autofill Remainder Amount to Expense Report Payment Page
 2018-12-14 19:36:18 +01:00
Laurent Destailleur
45115a9590
Merge pull request #10191 from fappels/7.0_fix_issue#10186 
Fix issue #10186 no display of stock per batch series.
 2018-12-14 19:34:11 +01:00
Laurent Destailleur
0cbc0fa0fc Fix shortkey 2018-12-14 19:33:43 +01:00
Laurent Destailleur
32f51838ec
Merge pull request #10083 from aljawaid/aljawaid-improve_access_keys 
NEW: Improve Displaying Access Keys in Navigation
 2018-12-14 19:29:50 +01:00
Laurent Destailleur
d5bbb3033c
Update html.form.class.php 2018-12-14 19:29:15 +01:00
Laurent Destailleur
c85348c234
Update main.lang 2018-12-14 19:26:47 +01:00
Laurent Destailleur
015567afa6
Merge pull request #10034 from frederic34/oldfiles 
remove Old files on upgrade
 2018-12-14 19:25:01 +01:00
Laurent Destailleur
2d2481cc5f
Merge pull request #10068 from prietojc/patch-2 
New: Update just the multiprices that have been changed
 2018-12-14 19:22:26 +01:00
Laurent Destailleur
baf9b6f309 Fix regression (bad name of function) 2018-12-14 19:21:19 +01:00
Laurent Destailleur
4b90f88793
Merge pull request #10158 from defrance/patch-135 
Refactoring list with dol_sql_datefilter function (end)
 2018-12-14 19:06:54 +01:00
Laurent Destailleur
38ddfd9a62
Merge pull request #10152 from defrance/patch-134 
refactoring list.php with dol_sql_datefilter
 2018-12-14 19:06:29 +01:00
Laurent Destailleur
28562285b8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-14 19:04:28 +01:00
Laurent Destailleur
f9c06cdb82 FIX #9498 #10132 2018-12-14 19:04:17 +01:00
Laurent Destailleur
59bc15377d CSS 2018-12-14 18:58:55 +01:00
Laurent Destailleur
4ffafae025
Merge pull request #10116 from defrance/patch-126 
Introduce standard sql date format filter
 2018-12-14 17:58:45 +01:00
Laurent Destailleur
77c01a1fae
Update date.lib.php 2018-12-14 17:58:33 +01:00
Laurent Destailleur
31c5ac470b More powerfull easter egg 2018-12-14 17:57:19 +01:00
Laurent Destailleur
d93a6aa120 Fix regression 2018-12-14 17:54:23 +01:00
Laurent Destailleur
4f07ab841b
Merge pull request #10063 from aljawaid/patch-4 
NEW: Add hidden config 'ADD_UNSPLASH_LOGIN_BACKGROUND'
 2018-12-14 17:51:41 +01:00
Laurent Destailleur
1971482c24
Merge pull request #10180 from fappels/payments_pdf_expensereport 
NEW add payments table to pdf of expense report
 2018-12-14 17:46:48 +01:00
Laurent Destailleur
3571eaee3d
Merge branch 'develop' into NEW_change_order_concat_desc 2018-12-14 17:44:08 +01:00
Laurent Destailleur
ea35e45f76
Merge pull request #10197 from atm-maxime/fix_import_bank 
Fix unexistant fields
 2018-12-14 17:40:45 +01:00
Laurent Destailleur
05e56984d0
Merge pull request #10056 from frederic34/eldylib 
reduce complexity of eldylib menu
 2018-12-14 17:38:31 +01:00
Laurent Destailleur
0ac287c356
Merge pull request #10046 from frederic34/htmlformmail 
reduce complexity of htmlformmail class
 2018-12-14 17:37:34 +01:00
Laurent Destailleur
bd7df9869f
Update html.formmail.class.php 2018-12-14 17:37:08 +01:00
Laurent Destailleur
4dc32dafaa
Merge pull request #10043 from OPEN-DSI/selectcontacts-afterselectoptions-hook 
NEW Add afterSelectContactOptions hook
 2018-12-14 17:35:16 +01:00
Laurent Destailleur
89909ebab0
Update html.form.class.php 2018-12-14 17:32:41 +01:00
Laurent Destailleur
9fb672d51b
Merge pull request #10127 from atm-florian/develop_scrunitizer 
fix scrunitizer
 2018-12-14 17:28:34 +01:00
Laurent Destailleur
7665c368a2
Merge branch 'develop' into allow_ajax_search_on_product_desc 2018-12-14 17:24:52 +01:00
Laurent Destailleur
abd09ae631 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-14 17:24:17 +01:00
PMickael
37daface19 [Accounting][VAT] Fix balance should be based on period 
[Accounting][VAT] Fix balance should be based on period
 2018-12-14 17:23:45 +01:00
Laurent Destailleur
ae67c04d05
Merge pull request #10228 from PMickael/develop 
[Accounting][VAT] Fix balance should be based on period
 2018-12-14 17:21:46 +01:00
Laurent Destailleur
2c5a5e5eac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-14 16:25:48 +01:00
Laurent Destailleur
e0011222d1 Fix syntax error 2018-12-14 16:25:37 +01:00
Laurent Destailleur
b95fa8ad3e
Merge pull request #10038 from aspangaro/10.0_members 
NEW Add gender in member card
 2018-12-14 16:24:00 +01:00
Laurent Destailleur
98b8113a39 Fix multicompany 2018-12-14 16:20:23 +01:00
PMickael
5a9d034b1b
[Accounting][VAT] Fix balance should be based on period 
[Accounting][VAT] Fix balance should be based on period
 2018-12-14 16:17:25 +01:00
Laurent Destailleur
e7b703f0c0
Merge pull request #10154 from bugness-chl/develop-hookfacturerec 
NEW Adding hooks to facturerec
 2018-12-14 16:11:34 +01:00
Laurent Destailleur
c377350c35
Update facture-rec.class.php 2018-12-14 16:09:12 +01:00
Laurent Destailleur
88a52aa11d
Merge branch 'develop' into develop_mc 2018-12-14 15:58:52 +01:00
Laurent Destailleur
185524bd50
Update fiscalyear.php 2018-12-14 15:49:58 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
83efdee7d3
Merge branch 'develop' into new_mass_generate 2018-12-14 15:44:46 +01:00
Laurent Destailleur
611ccc4a9a
Merge branch 'develop' into fieldlabel 2018-12-14 15:42:01 +01:00
Laurent Destailleur
59e38d4a81
Merge pull request #9897 from Vaadasch/develop 
NEW Update working chkbxlst filter for lists
 2018-12-14 15:33:50 +01:00
Laurent Destailleur
233e160489
Merge pull request #9874 from atm-john/New_import_lines_from_linked_element_step2 
NEW Extend import option to Order's card and Propal's card
 2018-12-14 15:29:27 +01:00
Laurent Destailleur
0c3165a79a
Merge branch 'develop' into email-contact-card 2018-12-14 15:26:15 +01:00
altatof
d5bf9691ee allow product ajax search on description 2018-12-14 15:10:32 +01:00
Laurent Destailleur
9e83699193
Merge branch 'develop' into new_branch_31_10_2018 2018-12-14 14:27:35 +01:00
Laurent Destailleur
78cdade1a7
Merge pull request #10211 from atm-john/fix_error_message_details 
Add détails to error message
 2018-12-14 14:26:38 +01:00
Laurent Destailleur
7be2097e87 Fix phpcs 2018-12-14 12:00:14 +01:00
Alexandre SPANGARO
60f56fcf8d
Merge branch 'develop' into 10.0_members 2018-12-14 11:39:02 +01:00
Laurent Destailleur
8b0919d7e4 Fix phpcs 2018-12-14 11:26:37 +01:00
Laurent Destailleur
63aa7ac1ec Fix name of key 2018-12-14 11:16:05 +01:00
Laurent Destailleur
0113281cc9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-14 11:13:59 +01:00
Laurent Destailleur
2f075147a3 Migrate to 10 2018-12-14 11:13:48 +01:00
Laurent Destailleur
55487da03e
Merge branch 'develop' into langs_en_US 2018-12-14 11:09:25 +01:00
Laurent Destailleur
dc4a122697
Merge pull request #10224 from fmarcet/develop 
Qual: Better management of select type of lines
 2018-12-14 11:06:33 +01:00
Laurent Destailleur
8c9f81807f
Merge pull request #9702 from bafbes/abb80027 
New : Link to create new element on linked fields
 2018-12-14 11:01:39 +01:00
Laurent Destailleur
42de7da334
Update commonobject.class.php 2018-12-14 11:01:27 +01:00
Laurent Destailleur
3765db422a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/tables/llx_loan.sql
 2018-12-14 10:57:11 +01:00
Laurent Destailleur
6eaa6a1d28 Add missing column 2018-12-14 10:56:13 +01:00
Laurent Destailleur
fec64a78ab
Merge branch 'develop' into New_manage_loan_schedule 2018-12-14 10:54:09 +01:00
Laurent Destailleur
fab6dde593 Close #9825 2018-12-14 10:51:32 +01:00
Laurent Destailleur
177675b73d
Merge pull request #10225 from madx666/contrib 
Change type_mouvement on movement_list
 2018-12-14 10:40:00 +01:00
Laurent Destailleur
539e2c55cd FIX #9629 #9625 2018-12-14 10:33:07 +01:00
Laurent Destailleur
c1ce902f91 FIX #9629 #9625 2018-12-14 10:31:09 +01:00
Laurent Destailleur
9bb3382002
Merge pull request #9534 from wdammak/patch-16 
Add the ability to sort products by category
 2018-12-14 10:02:08 +01:00
Laurent Destailleur
e1baf3ab2b
Update html.form.class.php 2018-12-14 10:01:12 +01:00
Laurent Destailleur
5d5add641b Fix scrutinizer 2018-12-14 09:58:23 +01:00
torvista
1c7189ed40 supplier->vendor 
suppliers->vendors
 2018-12-13 22:24:45 +01:00
Laurent Destailleur
4fc2cefce3
Merge pull request #10181 from aljawaid/aljawaid-override_vat_expense_report 
NEW: Add Hidden Config 'OVERRIDE_VAT_FOR_EXPENSE_REPORT'
 2018-12-13 20:53:32 +01:00
Laurent Destailleur
3484b50511
Update html.form.class.php 2018-12-13 20:51:45 +01:00
Laurent Destailleur
5dabefe227 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2018-12-13 20:49:55 +01:00
Laurent Destailleur
dcb43214d6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-13 20:46:05 +01:00
Laurent Destailleur
7a3ab13196 FIX #10183 using backport of fix done in 9.0 2018-12-13 20:45:51 +01:00
Laurent Destailleur
f97b561af0
Merge branch 'develop' into qual_rename_facnumber 2018-12-13 20:24:12 +01:00
Laurent Destailleur
eefcf4b708
Merge pull request #9822 from bafbes/abb80034 
NEW Grant right to child classes to use Category methods
 2018-12-13 20:21:05 +01:00
Laurent Destailleur
1ee1b7a321
Merge pull request #10212 from atm-john/new_pdf_improve_desc_item_visibility 
NEW Hidden conf to improve pdf desc item visibitity
 2018-12-13 20:06:50 +01:00
Laurent Destailleur
210c937725
Merge pull request #10213 from inoveaconseil/patch-5 
NEW: Add note in tooltips
 2018-12-13 20:06:13 +01:00
Laurent Destailleur
860492a19f
Merge pull request #10201 from joseplluis/patch-3 
Fix: add ID property to select objects
 2018-12-13 20:03:46 +01:00
Laurent Destailleur
603656c7de
Merge pull request #10219 from simnandez/8.0 
FIX: #10218 Bad redirection after deleting a user or group
 2018-12-13 20:02:53 +01:00
Laurent Destailleur
1fd283fe6f
Merge pull request #10220 from defrance/patch-139 
fk_default_warehouse not defined on product class
 2018-12-13 20:02:31 +01:00
Laurent Destailleur
b6df9f88da
Merge pull request #10223 from OPEN-DSI/develop 
NEW Add contact status in category export
 2018-12-13 20:02:19 +01:00
Laurent Destailleur
f6775b8af5
Merge pull request #10222 from grandoc/new_branch_12_12_2018 
to avoid html issue
 2018-12-13 19:57:34 +01:00
Laurent Destailleur
4413b2e886
Merge pull request #10215 from atm-quentin/8.0_FIX_if_qty_is_0 
FIX if qty is 0
 2018-12-13 19:56:38 +01:00
Laurent Destailleur
6ad106d14a
Update fournisseur.facture.class.php 2018-12-13 19:56:22 +01:00
florian HENRY
2e57a8be51 better fix 2018-12-13 12:37:40 +01:00
florian HENRY
56923caeec Merge branch '8.0' of https://github.com/Dolibarr/dolibarr.git into 8.0_fix9964 2018-12-13 12:34:39 +01:00
Laurent Destailleur
b0941967f0 Fix sort of email templates 2018-12-13 12:13:28 +01:00
madx666
3159c3f8d1 Change type_mouvement on movement_list 2018-12-13 11:28:49 +01:00
Ferran Marcet
555698a3af Qual: Better management of select type of lines 2018-12-13 10:36:30 +01:00
Lionel VESSILLER
1512ba9242 Add contact status in category export 2018-12-12 14:20:04 +01:00
Laurent Destailleur
0ecdb0f3bb Code comment 2018-12-12 13:02:18 +01:00
Laurent Destailleur
61503bdaa9 Fix picto for status of cron task 2018-12-12 13:02:11 +01:00
Laurent Destailleur
ad3c679d28 Fix status in cron task list 2018-12-12 13:02:03 +01:00
Laurent Destailleur
ea041693b6 Code comment 2018-12-12 12:54:10 +01:00