Laurent Destailleur
|
7438f92912
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/compta/prelevement/create.php
htdocs/compta/prelevement/demandes.php
htdocs/compta/tva/document.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/card.php
|
2020-01-27 01:50:02 +01:00 |
|
florian HENRY
|
dc3eafccb9
|
add hook into withdraw list
|
2020-01-24 13:22:04 +01:00 |
|
florian HENRY
|
62caf3cbfc
|
fix create SEPA withdraw with limit select and working pagination
|
2020-01-23 17:59:50 +01:00 |
|
florian HENRY
|
5ad5578f40
|
fix create SEPA withdraw with limit select and working pagination
|
2020-01-23 17:47:00 +01:00 |
|
florian HENRY
|
210e0511d0
|
fix create SEPA withdraw with limit select and working pagination
|
2020-01-23 17:45:16 +01:00 |
|
florian HENRY
|
fd0daad959
|
fix SEPA line with limit select and working pagination
|
2020-01-23 16:49:06 +01:00 |
|
Laurent Destailleur
|
175894db26
|
FIX Status of direct debit payment after setting to paid.
|
2019-12-31 14:48:52 +01:00 |
|
Laurent Destailleur
|
3ae5901a64
|
Fix look and feel v11
|
2019-12-22 19:46:36 +01:00 |
|
Laurent Destailleur
|
f44b85f557
|
Fix $_SESSION['newtoken'] must be newToken()
|
2019-12-18 23:12:31 +01:00 |
|
Laurent Destailleur
|
835d22f556
|
Merge branch 'develop' into doxygen_todo
|
2019-12-14 13:46:40 +01:00 |
|
Laurent Destailleur
|
ce47de453e
|
Fix HTML5
|
2019-12-12 10:31:08 +01:00 |
|
Frédéric FRANCE
|
307bad1d2a
|
doxygen todo
|
2019-12-11 19:11:13 +01:00 |
|
Frédéric FRANCE
|
6d8c59991d
|
doxygen
|
2019-11-28 23:21:42 +01:00 |
|
Scrutinizer Auto-Fixer
|
eba082320c
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-16 22:25:24 +00:00 |
|
Scrutinizer Auto-Fixer
|
f197196719
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-14 11:09:46 +00:00 |
|
Scrutinizer Auto-Fixer
|
b40ecc3933
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-13 18:37:08 +00:00 |
|
Laurent Destailleur
|
453ffad9e8
|
Look and feel v11
|
2019-11-12 18:01:16 +01:00 |
|
Laurent Destailleur
|
2a67dd0f66
|
Look and feel v11
|
2019-11-12 17:43:27 +01:00 |
|
Laurent Destailleur
|
e79ac7081a
|
Look and feel v11
|
2019-11-12 17:37:05 +01:00 |
|
Scrutinizer Auto-Fixer
|
df664e790b
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-11 23:15:34 +00:00 |
|
Scrutinizer Auto-Fixer
|
2ecfe41810
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-08 09:53:31 +00:00 |
|
Frédéric FRANCE
|
35751a80ab
|
100% centpercent
|
2019-11-05 21:24:41 +01:00 |
|
Laurent Destailleur
|
e087ac434d
|
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
|
2019-11-02 13:34:21 +01:00 |
|
Laurent Destailleur
|
6348227698
|
Merge pull request #12275 from frederic34/patch-8
css
|
2019-11-02 13:31:18 +01:00 |
|
Frédéric FRANCE
|
77d4ca81dc
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-02 09:14:15 +01:00 |
|
Laurent Destailleur
|
cea2c3a9f4
|
Look and feel v11
|
2019-11-01 23:58:14 +01:00 |
|
Frédéric FRANCE
|
dbed10a701
|
Merge remote-tracking branch 'upstream/develop' into socid
|
2019-11-01 21:39:20 +01:00 |
|
Laurent Destailleur
|
e3b5be7475
|
All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed
into 'labelStatus'.
All properties 'labelstatusshort' and 'labelstatut_short' were renamed
into 'labelStatusShort'.
|
2019-11-01 12:52:03 +01:00 |
|
Frédéric FRANCE
|
e93aaa2a75
|
replace deprecated user->societe_id by user->socid
|
2019-10-31 20:46:31 +01:00 |
|
Frédéric FRANCE
|
f202424432
|
css
|
2019-10-30 18:52:54 +01:00 |
|
Frédéric FRANCE
|
a1f0245c79
|
clean indent in compta, contact directory
|
2019-10-26 18:13:20 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Laurent Destailleur
|
dbdc62b028
|
Fix td
|
2019-10-14 18:41:46 +02:00 |
|
Laurent Destailleur
|
24570f7165
|
Look and feel v11. Picto are fontawesome.
|
2019-10-02 18:14:41 +02:00 |
|
Alexandre SPANGARO
|
16c6c9ae75
|
Merge remote-tracking branch 'upstream/develop' into 11.0_https
|
2019-10-01 06:12:24 +02:00 |
|
Laurent Destailleur
|
14f7e48fe5
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-30 18:50:33 +02:00 |
|
Laurent Destailleur
|
a56b9e1ca9
|
The trigger BON_PRELEVEMENT has been renamed into
DIRECT_DEBIT_ORDER_CREATE.
|
2019-09-30 18:50:23 +02:00 |
|
Laurent Destailleur
|
cff8f582e7
|
Update bonprelevement.class.php
|
2019-09-30 18:47:18 +02:00 |
|
Laurent Destailleur
|
9d5b84ec44
|
Merge branch 'develop' into fix_9.0_withdraw_trigger_create_missing
|
2019-09-30 18:39:46 +02:00 |
|
Alexandre SPANGARO
|
aec50d3ac9
|
NEW Add fa_icon on load_fiche_titre
|
2019-09-30 10:14:55 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Laurent Destailleur
|
61cf47aa16
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-09-10 00:14:07 +02:00 |
|
Laurent Destailleur
|
cad9a59d2a
|
Add option to be able to find behaviour before the fix of list of
invoice in direct debit order.
|
2019-09-06 14:45:55 +02:00 |
|
Laurent Destailleur
|
09d6826e62
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/supplier_order.php
htdocs/langs/en_US/admin.lang
|
2019-09-06 14:27:01 +02:00 |
|
Laurent Destailleur
|
bc0b8dfad0
|
FIX Consistency in direct debit order lists.
FIX Confirmation of deletion
|
2019-09-06 14:24:33 +02:00 |
|
Laurent Destailleur
|
bc7bf3b4b5
|
FIX bad consistency in list of invoice for direct debit order.
|
2019-09-06 13:44:02 +02:00 |
|
Laurent Destailleur
|
d1a5be20ea
|
Fix wrong warning
|
2019-09-06 13:02:52 +02:00 |
|
Laurent Destailleur
|
bb81f66a1a
|
Add phpunit test for Lessc
|
2019-09-06 10:36:49 +02:00 |
|
atm-ph
|
f7fe3d2842
|
Fix set var in context attribute instead of object attribute
|
2019-09-04 16:30:55 +02:00 |
|
atm-ph
|
5aa27a126a
|
Fix trigger create on widthdraw is missing
|
2019-08-28 13:45:02 +02:00 |
|
Laurent Destailleur
|
d7a41c6b72
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/admin.lang
|
2019-08-01 12:54:27 +02:00 |
|
Laurent Destailleur
|
5eb8f05061
|
FIX #11584
|
2019-08-01 12:23:02 +02:00 |
|
Maxime Kohlhaas
|
3cc2c91e31
|
Use date_rum if defined
|
2019-07-28 22:26:19 +02:00 |
|
Laurent Destailleur
|
a61fdc5a3c
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-23 00:25:10 +02:00 |
|
Laurent Destailleur
|
a33ac665bb
|
Fix phpcs
|
2019-07-22 22:07:04 +02:00 |
|
Laurent Destailleur
|
bef3423764
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/admin.lang
|
2019-07-22 19:12:27 +02:00 |
|
Laurent Destailleur
|
9f95b10d0e
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/action/list.php
htdocs/comm/action/peruser.php
htdocs/compta/prelevement/card.php
htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
|
2019-07-22 19:11:27 +02:00 |
|
Laurent Destailleur
|
a379d7804c
|
Merge pull request #11535 from aspangaro/11.0_p1
QUAL Move ligne.php to line.php
|
2019-07-22 18:33:06 +02:00 |
|
Alexandre SPANGARO
|
5f042cf6ad
|
QUAL Move ligne.php to line.php
|
2019-07-19 23:19:06 +02:00 |
|
Laurent Destailleur
|
14751680d2
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-19 13:38:05 +02:00 |
|
Laurent Destailleur
|
2e08c02510
|
Better error management
|
2019-07-19 13:37:28 +02:00 |
|
atm-ph
|
a03bb00254
|
Fix missing hook
|
2019-07-19 11:26:21 +02:00 |
|
Laurent Destailleur
|
e5801c0b68
|
Update bonprelevement.class.php
|
2019-07-19 04:06:22 +02:00 |
|
Laurent Destailleur
|
50480bf517
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/opensurvey/index.php
|
2019-07-18 18:23:24 +02:00 |
|
Laurent Destailleur
|
3cffd70ed3
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/compta/prelevement/create.php
htdocs/core/class/commonobject.class.php
htdocs/expedition/card.php
htdocs/expedition/class/expedition.class.php
htdocs/fourn/commande/dispatch.php
htdocs/fourn/product/list.php
htdocs/opensurvey/index.php
htdocs/ticket/index.php
htdocs/ticket/list.php
|
2019-07-18 18:09:37 +02:00 |
|
atm-ph
|
fcd95ce073
|
Fix missing trigger call
|
2019-07-18 18:07:17 +02:00 |
|
Laurent Destailleur
|
b3182f65bc
|
Update create.php
|
2019-07-18 17:23:52 +02:00 |
|
atm-ph
|
984fe98342
|
Fix missing hook
|
2019-07-18 16:12:42 +02:00 |
|
Laurent Destailleur
|
adfbd62f8b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-14 00:44:35 +02:00 |
|
Laurent Destailleur
|
e0095871aa
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/compta/stats/byratecountry.php
htdocs/core/class/html.form.class.php
|
2019-07-14 00:19:56 +02:00 |
|
Maxime Kohlhaas
|
0aa42fefae
|
Fix : use RUM if defined in bank account
|
2019-07-09 18:13:11 +02:00 |
|
Laurent Destailleur
|
f5cc29417d
|
Translation lignes -> lines
|
2019-07-05 21:50:35 +02:00 |
|
Louis Sautier
|
818a8c7d59
|
Fix missing form end tag in prelevement
|
2019-07-03 10:46:32 +02:00 |
|
Laurent Destailleur
|
2cefe638ef
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
build/makepack-dolibarr.pl
htdocs/compta/prelevement/factures.php
|
2019-06-29 23:24:04 +02:00 |
|
Laurent Destailleur
|
81bb85c4df
|
Merge
|
2019-06-29 23:19:47 +02:00 |
|
Laurent Destailleur
|
854bbf8405
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-06-28 14:09:00 +02:00 |
|
Maxime Kohlhaas
|
fc1d4704a5
|
Fix invoice list filter on withdrawal card
|
2019-06-27 17:33:47 +02:00 |
|
Laurent Destailleur
|
afb6362317
|
Fix look and feel v10
Fix link to direct debit payment order
|
2019-06-20 13:37:06 +02:00 |
|
Laurent Destailleur
|
2218994958
|
FIX Duplicate encoding on error message
|
2019-05-29 09:51:45 +02:00 |
|
Laurent Destailleur
|
5f23cf7e2a
|
CSS
|
2019-05-19 13:51:47 +02:00 |
|
ATM john
|
292d9c38a5
|
Appli function to links
|
2019-04-15 00:21:58 +02:00 |
|
Laurent Destailleur
|
8fe1be1a67
|
Removed deprecated use of string in dol_print_date(). Only date allowed.
|
2019-04-01 19:27:34 +02:00 |
|
Laurent Destailleur
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +01:00 |
|
Frédéric FRANCE
|
62501b11e8
|
add visibility
|
2019-03-02 00:14:22 +01:00 |
|
Frédéric FRANCE
|
014f69850e
|
add visibility
|
2019-03-01 23:08:57 +01:00 |
|
Philippe GRAND
|
0d5726b70a
|
update with html5 compliant code
|
2019-02-10 16:08:03 +01:00 |
|
Philippe GRAND
|
5d6ebad557
|
update with html5 compliant code
|
2019-02-10 16:05:06 +01:00 |
|
Philippe GRAND
|
9670228f06
|
update with html5 compliant code
|
2019-02-10 16:00:59 +01:00 |
|
Philippe GRAND
|
d42ef14a92
|
update with html5 compliant code
|
2019-02-10 15:59:19 +01:00 |
|
Frédéric FRANCE
|
970392adb8
|
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
|
2019-02-03 22:41:57 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +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
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +01:00 |
|
Frédéric FRANCE
|
f0cdf300d1
|
Squiz.Functions.FunctionDeclarationArgumentSpacing
|
2019-01-27 15:20:16 +01:00 |
|
Frédéric FRANCE
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +01:00 |
|
Frédéric FRANCE
|
7ee086b402
|
PSR2 space after comma in function call
|
2019-01-27 11:55:16 +01:00 |
|
Laurent Destailleur
|
fbf5a1c056
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-21 20:48:19 +01:00 |
|
Frédéric FRANCE
|
4ab19c25c8
|
add missing global $conf in bonprelevement class
|
2019-01-21 08:23:31 +01:00 |
|
markus
|
a45ea9239d
|
Rename consts and cleanup
|
2019-01-19 14:24:20 +01:00 |
|