Laurent Destailleur
|
028ff5e84c
|
Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
htdocs/fourn/facture/card.php
htdocs/langs/en_US/products.lang
htdocs/societe/list.php
|
2016-06-01 17:59:50 +02:00 |
|
Laurent Destailleur
|
ee420b79b1
|
FIX Infinite loop on menu tree output for edition
FIX Can show tree of entries added by external modules using fk_mainmenu
and fk_leftmenu instead of fk_menu.
|
2016-06-01 17:52:06 +02:00 |
|
Laurent Destailleur
|
7519c4a602
|
FIX Log of tax
FIX Missing import key on social contributions and missing class to
manage type of social contributions.
|
2016-06-01 13:24:27 +02:00 |
|
Laurent Destailleur
|
40005b8f65
|
FIX Missing search on barcode, only if defined
|
2016-06-01 12:15:54 +02:00 |
|
Laurent Destailleur
|
79291b7a77
|
Prepare 4.0
|
2016-05-31 00:35:21 +02:00 |
|
Laurent Destailleur
|
cc68b885a3
|
Fix minor css errors
|
2016-05-30 22:39:26 +02:00 |
|
Laurent Destailleur
|
1bc6c4ffa3
|
Clean code
|
2016-05-30 20:50:49 +02:00 |
|
Laurent Destailleur
|
0d277083e6
|
Fix duplicate translation
|
2016-05-30 19:56:59 +02:00 |
|
Laurent Destailleur
|
58ba5838ce
|
Fix alias name already visible into banner
|
2016-05-30 19:41:28 +02:00 |
|
Laurent Destailleur
|
460d7ce915
|
FIX Split of credit note into discount page generates records not
correctly recognised as credit note.
|
2016-05-30 19:38:28 +02:00 |
|
Laurent Destailleur
|
89cb122474
|
Merge branch '3.9' of github.com:Dolibarr/dolibarr into 3.9
|
2016-05-30 18:15:19 +02:00 |
|
Laurent Destailleur
|
ed148f70b3
|
FIX Filter on assigned to was preselected on current user on list "All
events" (instead of no filtering)
|
2016-05-30 18:12:27 +02:00 |
|
Laurent Destailleur
|
3cc8207bb7
|
FIX Filter on category tag for suppliers
|
2016-05-30 17:20:34 +02:00 |
|
Laurent Destailleur
|
2290f6a123
|
FIX Menu statistics was not visible if module proposal was not enabled
|
2016-05-30 13:11:44 +02:00 |
|
Laurent Destailleur
|
46a0f3dab0
|
Fix minor bugs
|
2016-05-30 01:30:28 +02:00 |
|
Laurent Destailleur
|
2dcc578b88
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2016-05-30 00:52:59 +02:00 |
|
Laurent Destailleur
|
3ddf427ff1
|
FIX Legal issue for GB. Add hidden option for this.
|
2016-05-30 00:52:16 +02:00 |
|
Laurent Destailleur
|
4c93340de1
|
Merge pull request #5232 from atm-florian/develop
Add trigger into expedition class
|
2016-05-29 13:15:35 +02:00 |
|
Laurent Destailleur
|
a1a335025f
|
FIX #5230
|
2016-05-29 12:05:11 +02:00 |
|
Laurent Destailleur
|
889ff16906
|
FIX #5239
|
2016-05-29 11:56:19 +02:00 |
|
Laurent Destailleur
|
d8c6ae0b17
|
Removed warnings
|
2016-05-29 11:26:05 +02:00 |
|
Laurent Destailleur
|
0b6bda910b
|
Removed scrutinizer warning
|
2016-05-29 11:23:32 +02:00 |
|
Laurent Destailleur
|
0c6e8b626a
|
Fix var not initialized
|
2016-05-29 11:20:27 +02:00 |
|
Laurent Destailleur
|
22d6d9497e
|
Fix ambiguous test on ldap return of getAttributes
|
2016-05-29 11:20:12 +02:00 |
|
Laurent Destailleur
|
ba43297936
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2016-05-28 14:10:41 +02:00 |
|
Juanjo Menent
|
caca9f0dd2
|
Merge pull request #5247 from simnandez/develop
Fix: Bad encoding and use original function 'implode' instead aliases 'join'
|
2016-05-28 11:53:51 +02:00 |
|
Juanjo Menent
|
fb5eef3163
|
Merge pull request #5246 from IonAgorria/patch-1
Fix: Fill ref_supplier in product supplier price
|
2016-05-28 11:53:25 +02:00 |
|
Juanjo Menent
|
f9e855d477
|
Merge pull request #5243 from oliverpool/patch-2
Fix contributing link
|
2016-05-28 11:52:18 +02:00 |
|
Juanjo Menent
|
a63dac3a9c
|
Merge pull request #5240 from fmarcet/peru
Fix: Update Peru regions and departaments
|
2016-05-28 11:51:46 +02:00 |
|
Laurent Destailleur
|
ef1e4d05ec
|
Doc comment
|
2016-05-27 17:01:23 +02:00 |
|
Laurent Destailleur
|
9511187f6e
|
FIX Change to status "Shipment in progress" for orders is done whane
validating and not creating a shipment.
|
2016-05-27 16:49:55 +02:00 |
|
Laurent Destailleur
|
c653acd4ce
|
Minor fixes
|
2016-05-27 14:56:59 +02:00 |
|
Juanjo Menent
|
5dec8f1935
|
Fix: Bad encoding and use original function 'implode' instead aliases 'join'
|
2016-05-27 10:56:39 +02:00 |
|
Laurent Destailleur
|
7278d1f2c6
|
NEW Add hidden option BANK_DISABLE_CHECK_DEPOSIT to disable check
deposit feature.
|
2016-05-27 10:38:15 +02:00 |
|
Laurent Destailleur
|
27da82df1f
|
FIX Missing columns in migration
|
2016-05-26 21:20:10 +02:00 |
|
Laurent Destailleur
|
9a3251bcc9
|
FIX Missing columns in migration
|
2016-05-26 21:18:08 +02:00 |
|
Laurent Destailleur
|
db56e1b8a1
|
FIX Missing columns in migration
|
2016-05-26 21:17:43 +02:00 |
|
Laurent Destailleur
|
97278c254e
|
Doc comment
|
2016-05-26 21:12:36 +02:00 |
|
Ion Agorria
|
6ba86e9d03
|
Fill ref_supplier in product supplier price
|
2016-05-26 20:53:01 +02:00 |
|
Laurent Destailleur
|
b8d5d6a383
|
Fix bad placeholder
|
2016-05-26 19:38:52 +02:00 |
|
Laurent Destailleur
|
b410aa57b9
|
Fix: Fetching category on label is not enough. We must introduce type
|
2016-05-25 15:36:48 +02:00 |
|
Laurent Destailleur
|
b476153b8b
|
Move POS at end of top menu
|
2016-05-25 00:02:48 +02:00 |
|
Laurent Destailleur
|
1617f3c62a
|
Fix colspan
|
2016-05-24 20:24:51 +02:00 |
|
Laurent Destailleur
|
a587ba496c
|
NEW Can select fields on supplier orders
|
2016-05-24 18:43:35 +02:00 |
|
Laurent Destailleur
|
9bd9cda224
|
Move to HTML5
|
2016-05-24 16:02:43 +02:00 |
|
Laurent Destailleur
|
e0812dddd2
|
Enhance css
|
2016-05-24 15:59:56 +02:00 |
|
oliverpool
|
e55da4f262
|
Fix contributing link
|
2016-05-24 11:25:27 +02:00 |
|
Your Name
|
c581b05c26
|
Fix: Update Peru regions and departaments
|
2016-05-23 18:38:55 +02:00 |
|
florian HENRY
|
37d366478f
|
change trigger position
|
2016-05-23 14:18:29 +02:00 |
|
florian HENRY
|
4e707af0fd
|
Add demo information and transsaction management
|
2016-05-23 09:16:47 +02:00 |
|