lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
71,981 Commits 43 Branches 150 Tags 886 MiB
c06e4ecd68
Commit Graph

71981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
c06e4ecd68
Merge pull request #10192 from AurelGDN/develop 
New: TakePOS +add Temporary ticket
 2018-12-16 17:44:18 +01:00
Laurent Destailleur
9ce07b9582 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2018-12-16 15:36:18 +01:00
Laurent Destailleur
e366d7d57c Work on cash fence 2018-12-16 15:30:31 +01:00
Laurent Destailleur
988ba172ae Clean code of POS modules 2018-12-16 14:59:51 +01:00
Laurent Destailleur
cde9da57f6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-16 13:39:56 +01:00
Laurent Destailleur
e14b426985 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/exports/export.php
 2018-12-16 13:39:16 +01:00
Laurent Destailleur
cca3b4870a FIX CVE-2018-19799 2018-12-16 13:36:51 +01:00
Laurent Destailleur
4a4bf3273b Experiment disabling of creation of contact+thirdparty with hidden 
option THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION
 2018-12-16 13:22:38 +01:00
Laurent Destailleur
8b718d0cb1 Fix phpcs 2018-12-16 13:01:53 +01:00
Laurent Destailleur
699766223f Fix phpcs 2018-12-16 13:00:24 +01:00
Laurent Destailleur
5dc9b44931 Fix phpcs 2018-12-16 12:59:59 +01:00
Laurent Destailleur
54a4a54afe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/en_US/banks.lang
 2018-12-15 20:00:31 +01:00
Laurent Destailleur
a601859985 Work on cash fence 2018-12-15 19:58:43 +01:00
Laurent Destailleur
2bfc5fe235 Work on cash fence 2018-12-15 19:56:08 +01:00
Laurent Destailleur
1c49599a47 Work on cash fence feature 2018-12-15 19:46:51 +01:00
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
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