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 |
|
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 |
|
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 |
|
Timoté Fallais
|
c31318f29d
|
Update libelle of user (making Mailman working correctly)
|
2019-03-07 09:15:43 +01:00 |
|
Christophe Battarel
|
96b8da0d62
|
fix supllier discount
|
2019-03-06 22:04:01 +01:00 |
|
Laurent Destailleur
|
b15e00cae7
|
FIX Autodetect buy price for invoices autogenerated with templates.
|
2019-03-06 21:39:09 +01:00 |
|
Laurent Destailleur
|
6206402be3
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-03-06 20:51:44 +01:00 |
|
Laurent Destailleur
|
1b0aec0847
|
Complete fields for template invoices
|
2019-03-06 20:51:07 +01:00 |
|
Frédéric FRANCE
|
d39b600ff4
|
Update CMailFile.class.php
|
2019-03-06 20:29:58 +01:00 |
|
Laurent Destailleur
|
31c296f44b
|
Fix bad tooltip to rm file
|
2019-03-06 20:01:21 +01:00 |
|
Laurent Destailleur
|
ddc3478156
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-03-06 19:14:15 +01:00 |
|
Laurent Destailleur
|
e163849d05
|
Fix label
|
2019-03-06 19:13:59 +01:00 |
|
Frédéric FRANCE
|
7b09562976
|
Update bom_card.php
|
2019-03-06 19:05:13 +01:00 |
|
Frédéric FRANCE
|
edf9913c20
|
Update bom_list.php
|
2019-03-06 19:00:12 +01:00 |
|
Frédéric FRANCE
|
2185f129cd
|
syntax error
|
2019-03-06 18:44:03 +01:00 |
|
Frédéric FRANCE
|
e57a674939
|
Update setup.php
|
2019-03-06 18:36:48 +01:00 |
|
Frédéric FRANCE
|
02d4a234b7
|
Update bom.lib.php
|
2019-03-06 18:30:34 +01:00 |
|
Frédéric FRANCE
|
cf00b2a2df
|
Update bom_note.php
|
2019-03-06 18:26:23 +01:00 |
|
Frédéric FRANCE
|
e4de89e3eb
|
Update bom_list.php
|
2019-03-06 18:25:02 +01:00 |
|
Frédéric FRANCE
|
6067994119
|
Update bom_document.php
|
2019-03-06 18:23:25 +01:00 |
|
Frédéric FRANCE
|
8246c79b15
|
Update bom_card.php
|
2019-03-06 18:20:44 +01:00 |
|
Laurent Destailleur
|
60a02bc241
|
Merge pull request #10757 from frederic34/patch-3
phpcs fix
|
2019-03-06 18:11:07 +01:00 |
|
Laurent Destailleur
|
9ffac1ca4a
|
Merge pull request #10750 from altatof/themefix
FIX : allow eldy theme stylesheet to be included in custom themes
|
2019-03-06 18:10:41 +01:00 |
|