Laurent Destailleur
6af8f8f475
Fix trans
2018-08-31 16:57:50 +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
b08971b03b
FIX vat rate code not return by get_product_vat_for_country
2018-08-31 14:52:34 +02:00
Laurent Destailleur
7b1a705be4
Clean duplicate code
2018-08-31 13:50:58 +02:00
atm-ph
102b698c76
Fix search company by code
2018-08-31 11:38:45 +02:00
Laurent Destailleur
e7d4956f5b
Clean not used function
2018-08-31 11:29:30 +02:00
Laurent Destailleur
07d5bd143a
Fix entity
2018-08-31 11:26:53 +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
Laurent Destailleur
bdbe2c02ed
Sample
2018-08-31 10:51:32 +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
2eade6ea68
Update modSociete.class.php
2018-08-30 23:22:06 +02:00
Frédéric FRANCE
26c0244dbb
Update ldap.class.php
2018-08-30 23:13:16 +02:00
Frédéric FRANCE
4ad5201a16
Update discount.class.php
2018-08-30 23:10:09 +02:00
Frédéric FRANCE
f61450ffa8
Update ldap.php
2018-08-30 23:04:32 +02:00
Frédéric FRANCE
9c44f80746
Update card.php
2018-08-30 23:03:03 +02:00
Laurent Destailleur
8dc208c961
Fix missing legal ids in source address
2018-08-30 19:19:43 +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
151d84405a
FIX trans on null object
2018-08-30 17:01:49 +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
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
