Laurent Destailleur
|
86f4e81a6e
|
Merge pull request #10773 from frederic34/patch-2
Update stats.class.php
|
2019-03-08 19:33:40 +01:00 |
|
Laurent Destailleur
|
9c97b2af30
|
Merge pull request #10769 from altatof/expe
NEW : add product extrafields to shipping export
|
2019-03-08 19:33:09 +01:00 |
|
Laurent Destailleur
|
a47cc4ef57
|
Fix script to delete data
|
2019-03-08 19:26:16 +01:00 |
|
Laurent Destailleur
|
6b8c2a1d3b
|
Enhance script to purge data
|
2019-03-08 14:09:22 +01:00 |
|
Laurent Destailleur
|
f6c52578cc
|
Add README file
|
2019-03-08 13:34:03 +01:00 |
|
Laurent Destailleur
|
4c75e6644d
|
Fix css
|
2019-03-07 21:57:03 +01:00 |
|
Laurent Destailleur
|
ebc2289292
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-03-07 20:53:16 +01:00 |
|
Laurent Destailleur
|
0798f7b719
|
NEW Can upload files from the edit page of expense report
|
2019-03-07 20:53:03 +01:00 |
|
Laurent Destailleur
|
ef56b020e5
|
Merge pull request #10736 from OPEN-DSI/fix-margin-agents3
Fix remove "canceled" invoices in margin by user
|
2019-03-07 20:45:40 +01:00 |
|
Frédéric FRANCE
|
1917adb980
|
Update stats.class.php
The property _lastfetchdate is declared private in Stats and cannot be accessed from this context.
|
2019-03-07 17:35:02 +01:00 |
|
Laurent Destailleur
|
4ecc1dac56
|
Merge pull request #10756 from altatof/fp2
NEW : add constant DISPLAY_DISCOUNTED_SUPPLIER_PRICE
|
2019-03-07 17:29:10 +01:00 |
|
Christophe Battarel
|
d414e3eb48
|
add product extrafields
|
2019-03-07 15:00:48 +01:00 |
|
Laurent Destailleur
|
25fa729e4e
|
NEW Add the now link when creating expense report
|
2019-03-07 14:32:03 +01:00 |
|
Laurent Destailleur
|
31e1ad48e3
|
css
|
2019-03-07 14:28:09 +01:00 |
|
Laurent Destailleur
|
b9408baef3
|
Fix if price net was not saved, we recalculate it at output
|
2019-03-07 14:27:20 +01:00 |
|
Laurent Destailleur
|
8d0a8d8263
|
Merge pull request #10758 from altatof/lf
NEW : add constant MAIN_DEFAULT_LANGUAGE_FILTER
|
2019-03-07 14:18:26 +01:00 |
|
Laurent Destailleur
|
975afd014d
|
Merge pull request #10763 from frederic34/patch-6
Update eldy.lib.php
|
2019-03-07 14:15:53 +01:00 |
|
Laurent Destailleur
|
ddc52b7199
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/tpl/objectline_create.tpl.php
htdocs/exports/export.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/fourn/facture/card.php
|
2019-03-07 14:13:38 +01:00 |
|
Laurent Destailleur
|
02b8bc94e7
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-03-07 14:06:31 +01:00 |
|
Laurent Destailleur
|
d2f1d0cc33
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/fourn/class/fournisseur.facture.class.php
|
2019-03-07 14:06:11 +01:00 |
|
Laurent Destailleur
|
4f189f4058
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-03-07 14:04:11 +01:00 |
|
Christophe Battarel
|
42926404ac
|
Merge https://github.com/Dolibarr/dolibarr into develop
|
2019-03-07 14:03:49 +01:00 |
|
Laurent Destailleur
|
e96f84a3d6
|
Merge pull request #10765 from altatof/sd8
FIX : supplier discount was not retrieved when choosing a product
|
2019-03-07 13:26:44 +01:00 |
|
Laurent Destailleur
|
0349f9bfaa
|
Update objectline_create.tpl.php
|
2019-03-07 13:26:25 +01:00 |
|
Laurent Destailleur
|
a40a08bada
|
Merge pull request #10753 from OPEN-DSI/fix-comm-action-contactid
Fix default contact id for update and clone actions in event card
|
2019-03-07 13:12:22 +01:00 |
|
Laurent Destailleur
|
3757fa83fd
|
Merge pull request #10760 from altatof/db
Avoid doing empty queries
|
2019-03-07 13:04:46 +01:00 |
|
Laurent Destailleur
|
b93a12bf19
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-03-07 13:03:06 +01:00 |
|
Laurent Destailleur
|
1fb86e12e5
|
Merge manually some enhancement from #10507
|
2019-03-07 13:02:51 +01:00 |
|
Laurent Destailleur
|
daaa4ca0c2
|
Merge pull request #10749 from frederic34/PSR2.Classes.PropertyDeclaration.VarUsed
PSR2.Classes.PropertyDeclaration.VarUsed
|
2019-03-07 12:49:13 +01:00 |
|
Laurent Destailleur
|
8ffab05f67
|
Merge pull request #10759 from altatof/ml
NEW : sort list of models alphabetically
|
2019-03-07 12:47:50 +01:00 |
|
Laurent Destailleur
|
8685f82a41
|
Merge pull request #10767 from Toumaniere/9.0
Update libelle of user (making Mailman working correctly)
|
2019-03-07 12:44:40 +01:00 |
|
Laurent Destailleur
|
a0bc6672d8
|
Try to avoid to make subquery when not necessary
|
2019-03-07 12:43:17 +01:00 |
|
Laurent Destailleur
|
b4bdbda9f5
|
Update mysqli.class.php
|
2019-03-07 12:36:57 +01:00 |
|
Laurent Destailleur
|
3e40451709
|
Merge pull request #10761 from frederic34/patch-4
add oldcopy of category before updating
|
2019-03-07 12:34:04 +01:00 |
|
Laurent Destailleur
|
fc87090669
|
Merge pull request #10764 from frederic34/patch-7
New format type 5 for email
|
2019-03-07 12:33:24 +01:00 |
|
Laurent Destailleur
|
2c68c98884
|
Merge pull request #10762 from frederic34/patch-3
Update bom_card.php
|
2019-03-07 12:32:35 +01:00 |
|
Laurent Destailleur
|
d6cf493880
|
Merge pull request #10768 from altatof/export
FIX avoid timeout for big export
|
2019-03-07 12:31:51 +01:00 |
|
Laurent Destailleur
|
40afeebe2d
|
Merge pull request #10748 from frederic34/patch-2
Update mailinglist_mymodule_myobject.modules.php
|
2019-03-07 12:31:09 +01:00 |
|
Laurent Destailleur
|
a9952c5807
|
Merge pull request #10741 from frederic34/patch-5
Update main.inc.php
|
2019-03-07 12:30:03 +01:00 |
|
Laurent Destailleur
|
2ae3d75df4
|
Merge pull request #10752 from atm-gauthier/7.0_fix_fourninvoice_specialcode
FIX : we need to keep originline special_code
|
2019-03-07 12:29:00 +01:00 |
|
Laurent Destailleur
|
e3fb228a4d
|
Update fournisseur.facture.class.php
|
2019-03-07 12:28:19 +01:00 |
|
Laurent Destailleur
|
f54eb78260
|
NEW Show the latest date of subscription in member statistics reports
|
2019-03-07 12:22:24 +01:00 |
|
Christophe Battarel
|
a6bb1cf5f6
|
avoid timeout
|
2019-03-07 11:27:06 +01:00 |
|
Christophe Battarel
|
1b26f1fa08
|
remove avoid timeout
|
2019-03-07 11:26:21 +01:00 |
|
Christophe Battarel
|
5a98207998
|
avoid timeout
|
2019-03-07 11:19:55 +01:00 |
|
Laurent Destailleur
|
a426c8e9bf
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/filecheck.php
htdocs/compta/facture/class/facture.class.php
htdocs/filefunc.inc.php
htdocs/install/upgrade2.php
htdocs/product/class/product.class.php
|
2019-03-07 11:16:24 +01:00 |
|
Laurent Destailleur
|
e67890bd22
|
NEW Can enter price with or without tax when entering expense repor line
|
2019-03-07 11:09:04 +01:00 |
|
Laurent Destailleur
|
96d4e28473
|
FIX Vat src code lost after editing expense report line
|
2019-03-07 11:08:01 +01:00 |
|
Laurent Destailleur
|
2cd09aaf09
|
Prepare version 9.0.2
|
2019-03-07 10:57:15 +01:00 |
|
Laurent Destailleur
|
c513116717
|
FIX missing vat_src_code when inserting an expense report line
|
2019-03-07 10:56:48 +01:00 |
|