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 |
|
Laurent Destailleur
|
4d22c4f9f9
|
Typo
|
2018-08-30 11:37:06 +02:00 |
|
ksar-ksar
|
49d3bea192
|
Remove the test
After discussion with Frederic, the best solution is to remove the test
|
2018-08-30 11:27:48 +02:00 |
|
Frédéric FRANCE
|
5100b8b7b0
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-30 10:42:47 +02:00 |
|
Frédéric FRANCE
|
57207794c2
|
tabs added
|
2018-08-30 10:30:52 +02:00 |
|
Frédéric FRANCE
|
1bdc33f286
|
tabs added
|
2018-08-30 10:02:31 +02:00 |
|
Frédéric FRANCE
|
4196febb67
|
tabs added
|
2018-08-30 09:40:04 +02:00 |
|
atm-greg
|
f8fef61075
|
remove useless db begin
|
2018-08-30 09:19:44 +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
|
285e231ea1
|
Update blockedlog.lang
|
2018-08-29 23:08:13 +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
|
f146572b81
|
ident
|
2018-08-29 21:18:47 +02:00 |
|
ptibogxiv
|
eaa49e773d
|
fix deletion of stripe customer
|
2018-08-29 21:13:45 +02:00 |
|
Laurent Destailleur
|
e2865ff75f
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-08-29 21:13:10 +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
|
617adc73c1
|
Merge pull request #9326 from atm-quentin/7.0_new_dispatch
FIX hook on dispatch order fourn
|
2018-08-29 21:11:42 +02:00 |
|
Laurent Destailleur
|
7211aff016
|
Update dispatch.php
|
2018-08-29 21:11:28 +02:00 |
|
Laurent Destailleur
|
a8bb55c66d
|
Merge branch '8.0' into 7.0_new_dispatch
|
2018-08-29 21:08:51 +02:00 |
|
Laurent Destailleur
|
6ca9854a34
|
Fix to avoid fetch when no accounting account defined
|
2018-08-29 21:07:00 +02:00 |
|
Laurent Destailleur
|
88044a3d75
|
Update dispatch.php
|
2018-08-29 20:42:19 +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 |
|
Laurent Destailleur
|
0c11007e34
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
README.md
htdocs/comm/propal/card.php
|
2018-08-29 18:53:39 +02:00 |
|
Laurent Destailleur
|
e317b0847a
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
README.md
|
2018-08-29 18:50:00 +02:00 |
|
Laurent Destailleur
|
7af083f1ec
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-08-29 18:49:08 +02:00 |
|
Frédéric FRANCE
|
cbdc669ba9
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-29 18:45:36 +02:00 |
|
Laurent Destailleur
|
34ceec7067
|
FIX #9328
|
2018-08-29 18:40:12 +02:00 |
|