Philippe Grand
|
b3c84ac3bc
|
Merge branch 'develop' into new_branch_29_08_2018
|
2018-08-30 12:09:40 +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 |
|
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 |
|
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 |
|
Laurent Destailleur
|
34ceec7067
|
FIX #9328
|
2018-08-29 18:40:12 +02:00 |
|
Laurent Destailleur
|
4e7e290624
|
FIX #9328
|
2018-08-29 18:38:58 +02:00 |
|
Laurent Destailleur
|
428354303c
|
FIX #9328
|
2018-08-29 18:29:42 +02:00 |
|
Laurent Destailleur
|
d8bd76b8ce
|
FIX #9328
|
2018-08-29 18:27:39 +02:00 |
|
Laurent Destailleur
|
275b9a9960
|
Merge pull request #9325 from frederic34/patch-12
Fix allow barcode with special char
|
2018-08-29 18:01:15 +02:00 |
|
Laurent Destailleur
|
86d8513138
|
Merge pull request #9309 from frederic34/trimtrailing2
last trimtrailing
|
2018-08-29 17:57:05 +02:00 |
|
Laurent Destailleur
|
46a24ff28f
|
Merge pull request #9321 from atm-gauthier/6.0_fix_default_bank_on_create_propal
FIX : $fk_account is always empty, must be $soc->fk_account
|
2018-08-29 17:56:36 +02:00 |
|
ptibogxiv
|
b9179f27a0
|
Fix multicompany in ticket/list.php
Conflicts:
htdocs/ticket/class/ticket.class.php
|
2018-08-29 17:55:55 +02:00 |
|
Laurent Destailleur
|
8fc289b7bb
|
Merge pull request #9324 from ptibogxiv/patch-43
Fix multicompany in ticket/list.php
|
2018-08-29 17:53:28 +02:00 |
|
Laurent Destailleur
|
42f509119f
|
Merge pull request #9315 from frederic34/patch-11
Build Badge for 8.0
|
2018-08-29 17:50:22 +02:00 |
|
Laurent Destailleur
|
4d8424f9eb
|
Merge pull request #9314 from frederic34/patch-10
Build Badge for 7.0
|
2018-08-29 17:50:10 +02:00 |
|
Laurent Destailleur
|
cb24fa0f08
|
Merge pull request #9310 from frederic34/patch-9
Build Badge for 6.0
|
2018-08-29 17:50:04 +02:00 |
|
Laurent Destailleur
|
a5a629fd0f
|
Fix phpcs
|
2018-08-29 17:44:44 +02:00 |
|
Laurent Destailleur
|
4450a14c75
|
Comment
|
2018-08-29 17:40:19 +02:00 |
|
Laurent Destailleur
|
7bf48b8d77
|
Fix date_start and date_end not saved on supplier invoice
Conflicts:
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
|
2018-08-29 17:26:41 +02:00 |
|
ptibogxiv
|
4de8b8bfd9
|
fix deletion of stripe customer
|
2018-08-29 17:25:37 +02:00 |
|
Laurent Destailleur
|
2daa5b3ae0
|
Fix phpcs
|
2018-08-29 17:09:58 +02:00 |
|
Laurent Destailleur
|
98356c6ed0
|
Fix date_start and date_end not saved on supplier invoice
|
2018-08-29 17:03:18 +02:00 |
|
Frédéric FRANCE
|
0e512cbc36
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing2
|
2018-08-29 15:47:55 +02:00 |
|
Laurent Destailleur
|
ee204e2e64
|
Fix regression in php style
|
2018-08-29 15:37:35 +02:00 |
|
Laurent Destailleur
|
74b3e3e814
|
Fix for compatibility with lines with no prices (some external modules)
|
2018-08-29 14:50:12 +02:00 |
|
Frédéric FRANCE
|
24be0b7305
|
Update viewimage.php
code may have rich content (qrcode, datamatrix,...)
|
2018-08-29 13:08:52 +02:00 |
|
Philippe GRAND
|
46b00705b3
|
Fix white spaces
|
2018-08-29 12:54:03 +02:00 |
|
Frédéric FRANCE
|
7b2bfb28c2
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing2
|
2018-08-29 12:48:12 +02:00 |
|
Philippe Grand
|
0ab593fdb1
|
Merge branch 'develop' into new_branch_29_08_2018
|
2018-08-29 12:47:01 +02:00 |
|
Philippe GRAND
|
d948c9e2db
|
Fix white spaces
|
2018-08-29 12:42:55 +02:00 |
|
Philippe GRAND
|
660f02f5a6
|
Fix white spaces
|
2018-08-29 12:35:56 +02:00 |
|
Philippe GRAND
|
32a9e35a6a
|
Fix white spaces
|
2018-08-29 12:31:36 +02:00 |
|
Philippe GRAND
|
4b7dd5ace3
|
Fix white spaces
|
2018-08-29 12:29:05 +02:00 |
|
Philippe GRAND
|
88ad651743
|
Fix white spaces
|
2018-08-29 12:26:47 +02:00 |
|
ptibogxiv
|
5f94bffa25
|
Fix multicompany in ticket/list.php
|
2018-08-29 12:26:31 +02:00 |
|
Philippe GRAND
|
9681dfca1b
|
Fix white spaces
|
2018-08-29 12:23:03 +02:00 |
|
Philippe GRAND
|
a1f31120ba
|
Fix white spaces
|
2018-08-29 12:20:35 +02:00 |
|
Philippe GRAND
|
b29721df61
|
Fix white spaces
|
2018-08-29 12:17:59 +02:00 |
|
Philippe GRAND
|
da02a24269
|
Merge branch 'new_branch_29_08_2018' of github.com:grandoc/dolibarr into new_branch_29_08_2018
|
2018-08-29 12:14:51 +02:00 |
|
Philippe GRAND
|
79988282af
|
Fix white spaces
|
2018-08-29 12:14:07 +02:00 |
|
Philippe Grand
|
81eae4cbda
|
Update accountingaccount.class.php
|
2018-08-29 12:09:31 +02:00 |
|