Commit Graph

71935 Commits

Author SHA1 Message Date
Laurent Destailleur
2d1cf59f34
Merge pull request #10204 from andreubisquerra/master
Improve TakePOS responsive design
2018-12-15 16:37:51 +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
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
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
e3358b5b60
Merge pull request #10160 from aspangaro/10.0_accoutancy_stats
NEW: Add stats on entries & movements by fiscal year
2018-12-15 15:17:46 +01:00
Laurent Destailleur
eb66d45947
Merge branch 'develop' into 10.0_accoutancy_stats 2018-12-15 15:17:15 +01:00
Laurent Destailleur
394a19e93b
Merge pull request #10148 from atm-ph/new_bash_snake_case_to_camel_case
New bash snake case to camel case
2018-12-15 15:15:03 +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
72b44a9a32 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-12-15 14:05:48 +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
6c2b8f35fb
Merge pull request #9851 from atm-quentin/PR_NEW_reception
NEW Experimental module supplier reception
2018-12-15 12:57:45 +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
74ed3e9133
Merge pull request #10230 from torvista/lang-en_US
lang-en_US edits
2018-12-15 12:21:35 +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
8e08ea5c14
Merge pull request #10143 from atm-florian/8.0_fix9964
8.0 fix #9964
2018-12-14 19:40:53 +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