Commit Graph

68816 Commits

Author SHA1 Message Date
Abbes Bahfir
c288c42ee3 Fix: No link is shown to access for bank transfers. 2018-08-31 18:13:56 +01:00
Philippe GRAND
bb05e80a87 Standardize and update code 2018-08-31 18:47:25 +02:00
Philippe GRAND
edaa575435 Standardize and update code 2018-08-31 18:36:15 +02:00
Frédéric FRANCE
4f7b26186a
FIX syntax propal.class.php 2018-08-31 18:33:45 +02:00
Philippe GRAND
70ae8c6081 Standardize and update code 2018-08-31 18:27:16 +02:00
Philippe GRAND
2f307aae21 Standardize and update code 2018-08-31 18:06:17 +02:00
Philippe GRAND
9e880d3e72 Standardize and update code 2018-08-31 17:55:31 +02:00
Philippe GRAND
7973489f8a fix display comment issue 2018-08-31 17:18:08 +02:00
Philippe GRAND
cd6ea37ea0 Merge branch 'new_branch_30_08_2018' of github.com:grandoc/dolibarr into develop 2018-08-31 17:10:10 +02:00
Philippe GRAND
a62a5ab636 Merge remote-tracking branch 'upstream/develop' into develop 2018-08-31 17:00:46 +02:00
Philippe GRAND
c60c38dfb3 Merge branch 'new_branch_30_08_2018' of github.com:grandoc/dolibarr into new_branch_30_08_2018 2018-08-31 16:42:38 +02:00
Philippe GRAND
6474646e4b Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_branch_30_08_2018 2018-08-31 16:37:03 +02:00
Laurent Destailleur
7b1a705be4 Clean duplicate code 2018-08-31 13:50:58 +02:00
Laurent Destailleur
e7d4956f5b Clean not used function 2018-08-31 11:29:30 +02:00
Josep Lluís
a514b97837
FIX: add global PRODUCT_DISABLE_VOLUME on create
On update and view the global PRODUCT_DISABLE_VOLUME is used.
But on create it does not exists.
2018-08-31 10:57:01 +02:00
Frédéric FRANCE
5833e6c5d8
Update categorie.class.php 2018-08-31 08:56:00 +02:00
Frédéric FRANCE
d8441619ed
Update export.php 2018-08-31 08:29:51 +02:00
Frédéric FRANCE
26c0244dbb
Update ldap.class.php 2018-08-30 23:13:16 +02:00
Laurent Destailleur
9cc6533d11 Fix td alignement 2018-08-30 18:57:30 +02:00
Josep Lluís
d70e548f94
Fix: undefined rights_class on modules
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
2018-08-30 18:12:02 +02:00
Laurent Destailleur
d14bd829fb FIX trans on null object 2018-08-30 17:01:22 +02:00
Philippe Grand
5ec22d9fad
Update accountingaccount.class.php 2018-08-30 14:25:25 +02:00
Philippe Grand
e96e3bdf42
Update accountancycategory.class.php 2018-08-30 14:19:21 +02:00
ptibogxiv
49729c3118
Add shipping_method label 2018-08-30 13:54:10 +02:00
Philippe GRAND
ba6a48360e Standardize and update code 2018-08-30 12:26:59 +02:00
Frédéric FRANCE
8af6c170ff
restore build badge for develop 2018-08-30 12:19:54 +02:00
Philippe Grand
b3c84ac3bc
Merge branch 'develop' into new_branch_29_08_2018 2018-08-30 12:09:40 +02:00
Philippe GRAND
2e66c65650 WTF... 2018-08-30 12:03:20 +02:00
Frédéric FRANCE
302179c739
Create index.html 2018-08-30 08:10:51 +02:00
Frédéric FRANCE
663745b787
Create index.html 2018-08-30 08:09:03 +02:00
Frédéric FRANCE
82302e5516
Create index.html 2018-08-30 08:08:01 +02:00
Frédéric FRANCE
f34455291f
Create index.html 2018-08-30 08:06:46 +02:00
ptibogxiv
de73f1545f
fix multicompany and footer
- fix viewimage and multicompany + no login
- delete ticket footer for common payment.lib.php footer
2018-08-30 02:42:14 +02:00
ptibogxiv
7a6df60cb0
header/footer uniformization in ticket public page 2018-08-30 02:38:50 +02:00
ptibogxiv
fc804d8eeb
Fix image if multicompany + no login in onlinesign 2018-08-30 02:37:11 +02:00
ptibogxiv
d2859276b5
add logo with multicompany
this fix push entity to viewimage.php
2018-08-30 02:35:42 +02:00
ptibogxiv
e512f1082f
Fix multicompany
we can need to use multicompany with evry modulepart ex. newpayment.php, ticket, onlinesign...
2018-08-30 02:33:22 +02:00
ptibogxiv
9cf67c4d5f
fix multicompany in public ticket page 2018-08-30 01:13:06 +02:00
Frédéric FRANCE
76d08ab7f5
Update config 2018-08-29 23:05:09 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Laurent Destailleur
3e0b2d0281 Fix phpcs 2018-08-29 21:51:49 +02:00
Laurent Destailleur
2cf37f621c
Merge pull request #9267 from torvista/develop
Installer: set protocol of autofill of main url to match installer protocol
2018-08-29 21:47:31 +02:00
Laurent Destailleur
872273ef95
Update fileconf.php 2018-08-29 21:46:39 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Laurent Destailleur
c071e751f7
Merge pull request #9329 from ptibogxiv/patch-44
FIX deletion of stripe customer
2018-08-29 21:12:53 +02:00
Laurent Destailleur
489e766cbf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/ticket/class/ticket.class.php
2018-08-29 20:24:01 +02:00
Laurent Destailleur
3ebfb23407 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/product/fournisseurs.php
	htdocs/ticket/class/ticket.class.php
2018-08-29 20:22:50 +02:00
Laurent Destailleur
d40e1a0d0b FIX #9258 2018-08-29 20:12:38 +02:00
Laurent Destailleur
8b291b2053 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	README.md
2018-08-29 19:55:10 +02:00
Laurent Destailleur
46fe19bed5 Code comment 2018-08-29 18:56:57 +02:00