Commit Graph

74027 Commits

Author SHA1 Message Date
ptibogxiv
289dfc7fbe
update API version
We need to downgrade this change to V8 because some breaks occur if Stripe API is updated in dashboard to 2018-08-23
2018-08-28 13:37:17 +02:00
ptibogxiv
90de2698c3
Fix for new stripe API 2018-08-23
Fix break of change API
2018-08-28 13:34:59 +02:00
ptibogxiv
523b03e132
Fix for new stripe API 2018-08-23
Fix break with change API
2018-08-28 13:32:38 +02:00
Laurent Destailleur
bbc6255925 Fix missing language 2018-08-28 13:07:48 +02:00
Philippe Grand
fa992c3e6d
Update modules_import.php 2018-08-28 10:44:18 +02:00
Philippe Grand
6fc813254b
Update html.formmail.class.php 2018-08-28 10:43:13 +02:00
Philippe Grand
b73fd487c0
Update ctyperesource.class.php 2018-08-28 10:41:54 +02:00
Philippe Grand
1856fb8946
Update ctyperesource.class.php 2018-08-28 10:41:26 +02:00
Philippe Grand
b7bc34963a
Update paymentsalary.class.php 2018-08-28 10:41:05 +02:00
Philippe Grand
1337d85a29
Update bankcateg.class.php 2018-08-28 10:40:41 +02:00
Philippe Grand
405f3ca858
Update categorie.class.php 2018-08-28 10:40:03 +02:00
Philippe Grand
32d63aa50c
Update asset.class.php 2018-08-28 10:39:11 +02:00
Philippe Grand
df05eb785b
Update accountingjournal.class.php 2018-08-28 10:38:42 +02:00
Philippe Grand
34ea3d479f
Update accountingaccount.class.php 2018-08-28 10:38:01 +02:00
Philippe Grand
c352bbbd18
Update accountancycategory.class.php 2018-08-28 10:37:16 +02:00
Frédéric FRANCE
d25f8d8bbd
Build Badge for 8.0 2018-08-28 10:08:09 +02:00
Frédéric FRANCE
055b7392d0
Build Badge for 7.0 2018-08-28 10:07:09 +02:00
Philippe GRAND
65af8f902f Update and standardize code 2018-08-28 09:44:54 +02:00
Frédéric FRANCE
53e476483c
Build Badge for 6.0 2018-08-28 09:38:24 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Frédéric FRANCE
1182f29864
trimtrailing 2018-08-28 08:33:02 +02:00
Steve
642f5fd343
Merge pull request #2 from Dolibarr/develop
update 28/8/2018
2018-08-28 08:29:09 +02:00
Laurent Destailleur
b875abb27b Fix logo on public page of survey 2018-08-28 03:03:05 +02:00
Laurent Destailleur
2349f99eb9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-28 02:58:51 +02:00
Laurent Destailleur
7df5993ee0 Fix logo in public survey page 2018-08-28 02:58:14 +02:00
Laurent Destailleur
50d50c2e10
Merge pull request #9307 from ATM-Marc/FIX_6.0_thirdparty_info
NEW On customer/supplier card, add simple tooltip to amount boxes
2018-08-28 02:48:05 +02:00
Laurent Destailleur
b1fc45fe3d
Merge branch 'develop' into develop 2018-08-28 02:43:04 +02:00
Laurent Destailleur
45e30271b3 Merge 2018-08-28 02:37:06 +02:00
Laurent Destailleur
9c6ce4b29d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-28 02:36:15 +02:00
Laurent Destailleur
9a14611d55
Merge pull request #8996 from grandoc/new_branch_20_06_2018
clean and update code
2018-08-28 02:35:59 +02:00
Laurent Destailleur
2db84a679e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/modulebuilder/index.php
2018-08-28 02:35:45 +02:00
Laurent Destailleur
7219bac0b2
Merge pull request #9168 from frederic34/trimtrailing
Trimtrailing
2018-08-28 02:30:02 +02:00
Laurent Destailleur
32ef9695a7
Merge pull request #9282 from frederic34/patch-19
Update card.php
2018-08-28 02:28:35 +02:00
Laurent Destailleur
7462a1ae1d
Update card.php 2018-08-28 02:27:56 +02:00
Laurent Destailleur
2306f8a7c2
Merge pull request #9265 from grandoc/new_branch_18_08_2018
Typo
2018-08-28 02:25:24 +02:00
Laurent Destailleur
0a7ce338f9 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/class/commondocgenerator.class.php
2018-08-28 02:23:34 +02:00
Laurent Destailleur
1842a4bb41
Merge pull request #9278 from grandoc/new_branch_21_08_2018
Update and standardize code
2018-08-28 02:13:28 +02:00
Laurent Destailleur
4369be7b39
Merge pull request #9284 from frederic34/patch-20
Update commondocgenerator.class.php
2018-08-28 02:11:50 +02:00
Laurent Destailleur
d725c5db1e
Merge pull request #9303 from jtraulle/develop
NEW REST API improvements
2018-08-28 02:09:42 +02:00
Laurent Destailleur
998dca9b9f
Update api_thirdparties.class.php 2018-08-28 02:05:37 +02:00
Laurent Destailleur
d90eed3098
Merge pull request #9291 from frederic34/patch-23
typo
2018-08-28 01:55:44 +02:00
Laurent Destailleur
f8811f1b6d
Merge pull request #9275 from frederic34/patch-18
align parameters
2018-08-28 01:44:55 +02:00
Laurent Destailleur
0d138b8fc0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-28 01:43:35 +02:00
Laurent Destailleur
6f427cbed3
Merge pull request #9293 from frederic34/patch-25
NEW Add __DAY_TEXT__ and __MONTH_TEXT__ substitutions vars
2018-08-28 01:42:35 +02:00
Laurent Destailleur
5185d32cc9
Merge pull request #9286 from frederic34/patch-22
Update propal.lib.php
2018-08-28 01:40:58 +02:00
Laurent Destailleur
fc897a8b99
Merge pull request #9285 from frederic34/patch-21
Update actions_ticket.class.php
2018-08-28 01:40:33 +02:00
Laurent Destailleur
14dc748523
Update actions_ticket.class.php 2018-08-28 01:40:27 +02:00
Laurent Destailleur
b96082a577
Merge pull request #9274 from frederic34/patch-17
Build badge for 5.0
2018-08-28 01:38:06 +02:00
Laurent Destailleur
b4652ea24b
Merge pull request #9292 from frederic34/patch-24
Create index.html
2018-08-28 01:37:48 +02:00
Laurent Destailleur
1f807b9216
Merge pull request #9305 from atm-gauthier/7.0_fix_altertable_charges
FIX : table llx_chargessociales doesn't exists
2018-08-28 01:37:31 +02:00