Commit Graph

73802 Commits

Author SHA1 Message Date
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
5f1087b9ce
Merge pull request #10625 from aspangaro/10.0_accountancy2
NEW: Add accounting account for result
2019-02-27 01:51:10 +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
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
69cccfe897
Merge pull request #10685 from aspangaro/10.0_linkedin
NEW: Add LinkedIn field
2019-02-27 01:16:28 +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
ee9d85b49d
Merge pull request #10683 from frederic34/patch-1
phpcs fix
2019-02-27 01:01:27 +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
ptibogxiv
a013b2a814
FIX; donation api checkressource 2019-02-26 18:19:44 +01:00
Laurent Destailleur
3a2a1b4a56 Debug module ticket 2019-02-26 13:43:09 +01:00
ptibogxiv
12e3e2c7c8
UPDATE support maximal fee in connect mode 2019-02-26 12:33:03 +01:00
Laurent Destailleur
5bcce53e40 Fix preselection when key is '0' 2019-02-26 12:20:22 +01:00
Laurent Destailleur
e0c7c32fae Fix preselection when key is '0' 2019-02-26 11:44:44 +01:00
Laurent Destailleur
528bfca690 Fix preselection when key is '0' 2019-02-26 11:44:16 +01:00
atm-quentin
35762c0d4e add data elem on task list 2019-02-26 11:25:40 +01:00
Frédéric FRANCE
1e6ed94c5e
Update extrafields.class.php
The property $errno was declared of type integer, but $this->db->lasterrno() is of type string
2019-02-25 21:39:45 +01:00
Josep Lluís
f6fc9190f3
Add no_email field in contact list
Add no_email field in contact list
2019-02-25 19:41:40 +01:00
Laurent Destailleur
fc1d0b2dd5 Add missing translation 2019-02-25 19:07:29 +01:00
Laurent Destailleur
25d277aceb More complete translation 2019-02-25 19:02:41 +01:00
Laurent Destailleur
5ffc1822d9 Translation 2019-02-25 19:01:51 +01:00
Laurent Destailleur
8a9339a059 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/compta/facture/class/api_invoices.class.php
2019-02-25 15:16:23 +01:00
Laurent Destailleur
8234c09412 Try some fixes 2019-02-25 15:15:17 +01:00
Laurent Destailleur
dde18e803d Fix transaction 2019-02-25 15:09:56 +01:00
Laurent Destailleur
3ba69fc93a Fix missing ; after sql request 2019-02-25 15:06:55 +01:00
Laurent Destailleur
1be1ee1670 Remove duplicate record 2019-02-25 14:56:28 +01:00
Laurent Destailleur
c0be66b5e5 FXI Remove duplicate record before trying to create unique key 2019-02-25 14:55:29 +01:00
Alexandre SPANGARO
2da1447a0b Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin 2019-02-25 09:12:04 +01:00