Commit Graph

64573 Commits

Author SHA1 Message Date
Laurent Destailleur
69bfac7eef Update html.form.class.php 2019-03-14 17:36:35 +01:00
Laurent Destailleur
c6b3d81d61 Update html.form.class.php 2019-03-14 17:35:44 +01:00
atm-quentin
1b9a2e5cfc FIX migration 9 to 10 2019-02-27 09:27:15 +01:00
atm-quentin
e39f85ac4d FIX js focusing 2019-02-27 09:23:39 +01:00
atm-quentin
72dc25552a FIX better placement 2019-02-27 09:23:31 +01:00
atm-quentin
cb3a4ac94c missing 1st char 2019-02-27 09:23:23 +01:00
atm-quentin
7f68750ec9 FIX blank space travis 2019-02-27 09:23:15 +01:00
atm-quentin
95593bfaad fix scan barcode only one time instead of 2 (when it was focus we need to open and then write) 2019-02-27 09:23:06 +01:00
atm-quentin
f1055d0e5c make select2 focus to earn time during scanning 2019-02-27 09:22:57 +01:00
atm-quentin
394659f84a missing doc 2019-02-27 09:22:47 +01:00
atm-quentin
f51b89def3 NEW supplier buyprice barcode 2019-02-27 09:22:34 +01:00
Laurent Destailleur
bcf1d57456 Fix default page is not always index.php 2019-02-27 04:21:12 +01:00
Laurent Destailleur
4634312306 Fix phpcs 2019-02-27 04:18:25 +01:00
Laurent Destailleur
61b7564664 Fix syntax error 2019-02-27 02:29:14 +01:00
Laurent Destailleur
97b51ec647 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-27 02:27:42 +01:00
Laurent Destailleur
401f587868 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/boxes/box_project.php
2019-02-27 02:27:33 +01:00
Laurent Destailleur
cbaa57b1e2 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-27 02:25:42 +01:00
Laurent Destailleur
86e2ffe323 Merge pull request #10390 from glu000/8.0
Fix #10278
2019-02-27 02:24:55 +01:00
Laurent Destailleur
b33b3698c8 Merge pull request #10691 from aspangaro/develop
NEW: Add graphic option for ACCOUNTANCY_COMBO_FOR_AUX
2019-02-27 02:18:20 +01:00
Laurent Destailleur
a6e9da192c Update accountancy.lang 2019-02-27 02:18:00 +01:00
Laurent Destailleur
238894a7e4 Merge pull request #10624 from frederic34/patch-2
selectMulticurrency avoid malformed empty value
2019-02-27 02:06:24 +01:00
Laurent Destailleur
62dbf15ba1 Merge pull request #10633 from ptibogxiv/patch-119
NEW options for alternative method
2019-02-27 02:02:53 +01:00
Laurent Destailleur
7618a7348f Merge branch 'develop' into 10.0_accountancy2 2019-02-27 01:51:01 +01:00
Laurent Destailleur
0b1821dabb Merge pull request #10694 from ptibogxiv/patch-131
UPDATE support maximal fee in connect mode
2019-02-27 01:46:21 +01:00
bomuux
9c5a4e303c SQL error in box_project.php
Corrected a bug : for an internal user with no rights to see all
projects, the project box on home cause an error in log.
Finally a lot of simplification because
Project::getProjectsAuthorizedForUser do most of the filtering.

Conflicts:
	htdocs/core/boxes/box_project.php
2019-02-27 01:44:15 +01:00
Laurent Destailleur
64f81e8f65 Merge pull request #10628 from bomuux/patch-4
FIX: sql error in box_project.php
2019-02-27 01:38:03 +01:00
Laurent Destailleur
d6651f3998 Update box_project.php 2019-02-27 01:37:20 +01:00
Laurent Destailleur
014c199173 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/extrafields_list_print_fields.tpl.php
2019-02-27 01:28:12 +01:00
Laurent Destailleur
6f0d5fcf3f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/variants/combinations.php
2019-02-27 01:25:25 +01:00
Laurent Destailleur
a48e9fdba4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2019-02-27 01:23:26 +01:00
Laurent Destailleur
8bdf1cd1b6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-02-27 01:22:37 +01:00
Laurent Destailleur
da826c4bc7 Fix bad var name 2019-02-27 01:22:26 +01:00
Laurent Destailleur
6373e1db84 Merge branch 'develop' into 10.0_linkedin 2019-02-27 01:16:21 +01:00
Laurent Destailleur
94166c505b Merge pull request #10690 from frederic34/patch-3
Update extrafields.class.php
2019-02-27 01:15:13 +01:00
Laurent Destailleur
0522f6649c Merge pull request #10696 from ptibogxiv/patch-132
FIX; donation api checkressource
2019-02-27 01:14:54 +01:00
Laurent Destailleur
49c4e5b694 Merge pull request #10700 from frederic34/patch-4
Update html.formticket.class.php
2019-02-27 01:14:34 +01:00
Laurent Destailleur
fb2b7a6c09 Merge pull request #10693 from atm-quentin/NEW_field_tasklist
add data elem on task list
2019-02-27 01:14:07 +01:00
Laurent Destailleur
92c27acbe9 Merge pull request #10689 from joseplluis/patch-4
NEW Add no_email field in contact list
2019-02-27 01:13:16 +01:00
Laurent Destailleur
60d01771b3 Merge pull request #10697 from ptibogxiv/patch-133
FIX dolibarize  don.class.php
2019-02-27 01:09:00 +01:00
Laurent Destailleur
53a4a57e91 Merge pull request #10699 from ptibogxiv/patch-134
FIX dolibarize fk_soc socid
2019-02-27 01:06:24 +01:00
Laurent Destailleur
25971d71a0 Merge branch 'develop' into patch-1 2019-02-27 01:00:57 +01:00
Laurent Destailleur
996b9e5c0f Merge pull request #10682 from andreubisquerra/master
Fix no JPG images in TakePOS and other image improvements.
2019-02-27 00:59:49 +01:00
Laurent Destailleur
58e2901d14 Fix phpcs 2019-02-27 00:54:07 +01:00
ptibogxiv
70fc33e8bb Update don.class.php 2019-02-27 00:14:11 +01:00
Frédéric FRANCE
242bf0ba49 Update html.formticket.class.php 2019-02-26 22:56:50 +01:00
Laurent Destailleur
3ec2338c2d Look and feel v10 2019-02-26 19:37:32 +01:00
Laurent Destailleur
9e82c37963 WIP Start module BOM 2019-02-26 19:27:04 +01:00
ptibogxiv
aa6e18f66f FIX dolibarize fk_soc socid 2019-02-26 18:45:02 +01:00
ptibogxiv
70e451a886 Update don.class.php 2019-02-26 18:44:07 +01:00
ptibogxiv
085aa8a247 FIX dolibarize fk_soc / socid 2019-02-26 18:31:00 +01:00