Laurent Destailleur
|
58e2901d14
|
Fix phpcs
|
2019-02-27 00:54:07 +01:00 |
|
Frédéric FRANCE
|
8b4e920d5e
|
add visibility
|
2019-02-26 22:42:19 +01:00 |
|
Frédéric FRANCE
|
5016bc7188
|
wip
|
2019-02-26 21:48:21 +01:00 |
|
Frédéric FRANCE
|
81f2f99db5
|
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing
|
2019-02-26 21:16:01 +01:00 |
|
Frédéric FRANCE
|
e6c3eb0ba1
|
wip
|
2019-02-26 21:13:07 +01:00 |
|
Laurent Destailleur
|
9e82c37963
|
WIP Start module BOM
|
2019-02-26 19:27:04 +01:00 |
|
Laurent Destailleur
|
3a2a1b4a56
|
Debug module ticket
|
2019-02-26 13:43:09 +01:00 |
|
Frédéric FRANCE
|
675a17a74c
|
wip
|
2019-02-26 00:34:43 +01:00 |
|
Frédéric FRANCE
|
346d1f410c
|
wip
|
2019-02-25 23:15:48 +01:00 |
|
Frédéric FRANCE
|
915841eeb9
|
wip
|
2019-02-25 22:50:19 +01:00 |
|
Frédéric FRANCE
|
c89e4d79b8
|
wip
|
2019-02-25 22:27:04 +01:00 |
|
Frédéric FRANCE
|
1c07006015
|
wip
|
2019-02-25 21:36:27 +01:00 |
|
Cristian Torres
|
c781eeb17d
|
[FIX] ORDER BY before custom filters for where
When filtering data "and cac.libelle" would be appended after ORDER BY
|
2019-02-24 20:55:27 +01:00 |
|
Laurent Destailleur
|
dfd6a0feaa
|
Merge pull request #10643 from tony13tv/patch-3
[FIX] ORDER BY before custom filters for where
|
2019-02-24 20:55:01 +01:00 |
|
Laurent Destailleur
|
89087473e1
|
Merge pull request #10674 from frederic34/patch-4
Update printgcp.modules.php
|
2019-02-24 20:44:08 +01:00 |
|
Frédéric FRANCE
|
e7706192b5
|
doc comment
|
2019-02-24 10:08:42 +01:00 |
|
Frédéric FRANCE
|
b51432790f
|
Update printgcp.modules.php
|
2019-02-24 09:39:48 +01:00 |
|
Frédéric FRANCE
|
485431a722
|
Update printgcp.modules.php
|
2019-02-24 09:31:19 +01:00 |
|
Laurent Destailleur
|
4da1bef6dc
|
Merge pull request #10654 from ptibogxiv/patch-125
FIX Stripe live Oauth
|
2019-02-23 14:21:25 +01:00 |
|
ptibogxiv
|
dd160a6242
|
Create stripelive_oauthcallback.php
|
2019-02-22 14:56:39 +01:00 |
|
Philippe GRAND
|
5a88930062
|
fix : The property total_vat does not exist on Reception
|
2019-02-21 14:38:12 +01:00 |
|
Cristian Torres
|
31aa3ec376
|
[FIX] ORDER BY before custom filters for where
When filtering data "and cac.libelle" would be appended after ORDER BY
|
2019-02-20 11:45:07 -06:00 |
|
Regis Houssin
|
1c3541295b
|
FIX wrong class name "CUnits instead CMeasuringUnits"
|
2019-02-19 09:24:30 +01:00 |
|
Laurent Destailleur
|
ebfb6beee3
|
Merge
|
2019-02-18 19:14:42 +01:00 |
|
Laurent Destailleur
|
e6e18ff616
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/menus/edit.php
htdocs/product/stock/card.php
htdocs/product/stock/info.php
htdocs/product/stock/movement_list.php
|
2019-02-14 15:33:17 +01:00 |
|
Laurent Destailleur
|
89050da856
|
Merge
|
2019-02-14 15:27:31 +01:00 |
|
Laurent Destailleur
|
afc612c2cb
|
Merge pull request #10592 from frederic34/patch-30
Update mod_expensereport_sand.php
|
2019-02-14 13:32:00 +01:00 |
|
Laurent Destailleur
|
418bab3214
|
Merge pull request #10591 from frederic34/patch-29
Update mod_payment_ant.php
|
2019-02-14 13:31:51 +01:00 |
|
Laurent Destailleur
|
a655481adb
|
Merge pull request #10590 from frederic34/patch-28
Update mod_ticket_universal.php
|
2019-02-14 13:31:33 +01:00 |
|
Laurent Destailleur
|
cd9bd26267
|
Merge pull request #10589 from frederic34/patch-27
Update mod_facture_mercure.php
|
2019-02-14 13:31:15 +01:00 |
|
Laurent Destailleur
|
b69a416960
|
Merge pull request #10588 from frederic34/patch-24
Update mod_commande_fournisseur_orchidee.php
|
2019-02-14 13:29:15 +01:00 |
|
Laurent Destailleur
|
7e4a4c2ae6
|
Merge pull request #10587 from frederic34/patch-23
Update mod_holiday_immaculate.php
|
2019-02-14 13:28:56 +01:00 |
|
Laurent Destailleur
|
c45ed24342
|
Merge pull request #10586 from frederic34/patch-22
Update modules_holiday.php
|
2019-02-14 13:28:30 +01:00 |
|
Laurent Destailleur
|
3050366372
|
Fix table of units already exists. Merge duplicate c_measuring_units
with c_units.
|
2019-02-14 13:02:44 +01:00 |
|
Regis Houssin
|
359318392f
|
FIX missing entity filter in function "build_filterField()" (export)
|
2019-02-14 10:47:07 +01:00 |
|
Frédéric FRANCE
|
6276845956
|
Update mod_expensereport_sand.php
|
2019-02-13 23:48:44 +01:00 |
|
Frédéric FRANCE
|
1e52ef19a5
|
Update mod_payment_ant.php
|
2019-02-13 23:45:28 +01:00 |
|
Frédéric FRANCE
|
423a69ffad
|
Update mod_ticket_universal.php
|
2019-02-13 23:44:06 +01:00 |
|
Frédéric FRANCE
|
210fb2eac1
|
Update mod_facture_mercure.php
|
2019-02-13 23:41:47 +01:00 |
|
Frédéric FRANCE
|
5c50ea8afe
|
Update mod_commande_fournisseur_orchidee.php
The property db does not exist on mod_commande_fournisseur_orchidee
|
2019-02-13 23:39:02 +01:00 |
|
Frédéric FRANCE
|
9370c8b3f6
|
Update mod_holiday_immaculate.php
|
2019-02-13 23:36:16 +01:00 |
|
Frédéric FRANCE
|
e0843e6130
|
Update modules_holiday.php
|
2019-02-13 23:35:44 +01:00 |
|
Laurent Destailleur
|
a689f8dc3f
|
Code comment
|
2019-02-13 23:34:28 +01:00 |
|
florian HENRY
|
d88475c61a
|
Merge branch 'develop' of local repository into dev_importproduct_measuringunit
|
2019-02-13 08:59:18 +01:00 |
|
Laurent Destailleur
|
0d8447ad39
|
Merge branch 'develop' of https://github.com/wdammak/dolibarr into
wdammak-develop
# Conflicts:
# htdocs/core/modules/stock/doc/pdf_stdmovement.modules.php
|
2019-02-12 16:58:55 +01:00 |
|
florian HENRY
|
5b5f96bafb
|
NEW : measuring unit dictionnary and product size/unit import
|
2019-02-12 16:58:11 +01:00 |
|
Laurent Destailleur
|
205152501e
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/public/payment/newpayment.php
|
2019-02-12 13:39:39 +01:00 |
|
Laurent Destailleur
|
e054b080a5
|
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-12 13:33:39 +01:00 |
|
Laurent Destailleur
|
b1088f556f
|
Merge pull request #10536 from grandoc/new_branch_09_02_2019
language internationalization
|
2019-02-12 13:28:56 +01:00 |
|
Laurent Destailleur
|
a62bccaf24
|
Fix phpcs
|
2019-02-11 19:19:05 +01:00 |
|