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 |
|
Laurent Destailleur
|
f0e56abac7
|
NEW Module ticket is available as a stable module
|
2019-02-11 19:16:37 +01:00 |
|
Laurent Destailleur
|
c095f802dd
|
Dolibarrize module ticket
|
2019-02-11 14:51:59 +01:00 |
|
Frédéric FRANCE
|
152d8ffcbf
|
Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-10 11:08:59 +01:00 |
|
Frédéric FRANCE
|
1e43f8e54a
|
PEAR FunctionCallSignature
|
2019-02-10 10:45:49 +01:00 |
|
Frédéric FRANCE
|
580e5c42d2
|
GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-09 12:00:49 +01:00 |
|
Philippe Grand
|
92ec149fb6
|
Update modules_fichinter.php
|
2019-02-09 11:05:52 +01:00 |
|
Philippe GRAND
|
869f59de96
|
language internationalization
|
2019-02-09 10:56:59 +01:00 |
|
Laurent Destailleur
|
7625eb7cd4
|
Fix missing error management after afterPDFCreation hook.
Removed dead code
|
2019-02-08 19:54:24 +01:00 |
|
Laurent Destailleur
|
a916708068
|
Fix missing disable dependency
|
2019-02-08 19:01:47 +01:00 |
|
Laurent Destailleur
|
ed733fb82d
|
Fix phpcs
|
2019-02-08 13:28:10 +01:00 |
|
Laurent Destailleur
|
8760b1e592
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-08 12:57:50 +01:00 |
|
Laurent Destailleur
|
27da574e38
|
Fix phpcs
|
2019-02-08 12:36:33 +01:00 |
|
Laurent Destailleur
|
1611c613f5
|
Fix phpcs
|
2019-02-08 12:19:51 +01:00 |
|
Laurent Destailleur
|
ec686a8f79
|
Fix phpcs
|
2019-02-08 11:30:20 +01:00 |
|
Laurent Destailleur
|
38d4284638
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/db/pgsql.class.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/filefunc.inc.php
htdocs/imports/import.php
htdocs/supplier_proposal/card.php
|
2019-02-08 11:26:08 +01:00 |
|
Laurent Destailleur
|
fe1188c4ea
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/filefunc.inc.php
|
2019-02-08 10:44:45 +01:00 |
|
Laurent Destailleur
|
af92303319
|
Merge pull request #10487 from frederic34/psr2squizwhite
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-08 09:30:25 +01:00 |
|
Laurent Destailleur
|
6a4a92510d
|
Code comment
|
2019-02-07 13:32:05 +01:00 |
|
atm-ph
|
8e6a567b09
|
Fix display payment table on multiple pages
|
2019-02-07 12:36:22 +01:00 |
|
Frédéric FRANCE
|
e1e14ae6e6
|
wip
|
2019-02-03 22:58:56 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Laurent Destailleur
|
57f81217ee
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/localtax/index.php
htdocs/compta/tva/index.php
|
2019-02-03 21:14:44 +01:00 |
|
Laurent Destailleur
|
4d41b1b33c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-02-03 19:45:45 +01:00 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Laurent Destailleur
|
9f7dfe2921
|
Merge pull request #10481 from frederic34/psr2forloop
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
|
2019-02-03 19:11:07 +01:00 |
|
Laurent Destailleur
|
f8b10e9c3d
|
Doxygen
|
2019-02-03 18:47:55 +01:00 |
|
Frédéric FRANCE
|
273d68381c
|
psr2 end file new line none found
|
2019-02-03 15:21:21 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Laurent Destailleur
|
75845a990f
|
FIX Missing province in export of invoice
|
2019-02-01 22:55:28 +01:00 |
|
Frédéric FRANCE
|
f5b2cf75f2
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-01 18:31:44 +01:00 |
|
Laurent Destailleur
|
6de732d7f8
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
|
2019-02-01 16:07:18 +01:00 |
|
Laurent Destailleur
|
35f65a571c
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/modules/facture/mod_facture_mars.php
htdocs/core/modules/facture/mod_facture_terre.php
htdocs/fourn/commande/list.php
|
2019-02-01 16:05:43 +01:00 |
|
Laurent Destailleur
|
dee2a373c1
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
|
2019-02-01 16:01:18 +01:00 |
|
Laurent Destailleur
|
eb3621839a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/members.lang
htdocs/langs/fr_FR/members.lang
|
2019-02-01 15:14:19 +01:00 |
|
Laurent Destailleur
|
4254ad0d33
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-01-31 15:51:54 +01:00 |
|
Laurent Destailleur
|
14dea53700
|
FIX Missing field in import/export of users
|
2019-01-31 15:51:02 +01:00 |
|
gauthier
|
09ba059c21
|
FIX : need an order by in case we found other invoice with same number but not same date
|
2019-01-31 11:03:06 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +01:00 |
|
Laurent Destailleur
|
97248a830b
|
FIX #10440
|
2019-01-30 16:28:37 +01:00 |
|
Laurent Destailleur
|
6d992a6d7b
|
FIX #10440
|
2019-01-30 16:24:27 +01:00 |
|
Laurent Destailleur
|
e72d6c50e6
|
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
|
2019-01-30 16:17:09 +01:00 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +01:00 |
|
Laurent Destailleur
|
c354656b1b
|
Merge pull request #10449 from ptibogxiv/patch-108
NEW : list of stripe's payout
|
2019-01-30 15:02:27 +01:00 |
|
Laurent Destailleur
|
60fa8d08c2
|
Merge pull request #10456 from aspangaro/10.0_Ledger_improve_import
FIX: FEC Compatibility for import in ledger
|
2019-01-30 15:01:02 +01:00 |
|
Alexandre SPANGARO
|
84ecfd96fb
|
Update example
|
2019-01-30 11:22:01 +01:00 |
|
Alexandre SPANGARO
|
1b675ba0b6
|
FIX: FEC Compatibility for import in ledger
|
2019-01-30 09:51:29 +01:00 |
|
ptibogxiv
|
a3b648824a
|
ADD payout link
|
2019-01-29 14:12:35 +01:00 |
|
Alexandre SPANGARO
|
cc88c4f8ff
|
Move my email to the new one
|
2019-01-28 21:39:22 +01:00 |
|
Frédéric FRANCE
|
77747ac2a3
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-28 16:35:12 +01:00 |
|
Frédéric FRANCE
|
764a928cd6
|
wip
|
2019-01-27 23:48:36 +01:00 |
|
Frédéric FRANCE
|
ff39491f15
|
wip
|
2019-01-27 23:31:37 +01:00 |
|
Frédéric FRANCE
|
b10558bacd
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-01-27 23:23:38 +01:00 |
|
Laurent Destailleur
|
46bc078481
|
Fix phpcs
|
2019-01-27 23:10:10 +01:00 |
|
Laurent Destailleur
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +01:00 |
|
Laurent Destailleur
|
a268a13c89
|
Merge pull request #10423 from grandoc/new_branch_27_01_2019
fix translations
|
2019-01-27 17:55:05 +01:00 |
|