Commit Graph

206 Commits

Author SHA1 Message Date
Laurent Destailleur
b078c2dcc9
Update list.php 2021-04-02 01:34:53 +02:00
Ferran Marcet
75d395c848 FIX: Filter on supplier payment list 2021-04-01 14:13:59 +02:00
Frédéric FRANCE
1bc3301a7f
fix doxygen 2021-03-20 10:10:41 +01:00
Alexandre SPANGARO
4fd24c6855 Translation "Generated documents" 2021-03-16 04:04:18 +01:00
Frédéric FRANCE
ed6d2376f1
code syntax fourn directory 2021-02-25 23:21:30 +01:00
Laurent Destailleur
3ff80ac1f8 FIX #16304 2021-02-19 14:15:58 +01:00
Laurent Destailleur
5340c30db3 FIX missing security test on payment page
FIX sql error on group by on payment list
2021-02-19 12:35:26 +01:00
Laurent Destailleur
348fd0fcb5 FIX #16160 2021-02-03 19:36:10 +01:00
Laurent Destailleur
be249538ee Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
2020-12-08 18:17:02 +01:00
Laurent Destailleur
34e7943d09 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/fourn/class/paiementfourn.class.php
2020-12-08 18:14:56 +01:00
Laurent Destailleur
4e72543fde Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/fourn/class/paiementfourn.class.php
	htdocs/fourn/paiement/card.php
2020-12-08 18:11:39 +01:00
Alexandre SPANGARO
0a24298385 FIX: Problem on supplier payment card 2020-12-04 02:57:40 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
1b939ab8f4
Merge pull request #15183 from frederic34/dol_fiche_end
end of dol_fiche_end
2020-10-27 19:00:32 +01:00
Laurent Destailleur
358ac4cd36 Fix scrutinizer 2020-10-27 18:55:55 +01:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
520645a02c Renamed all methods valide() into validate() 2020-10-15 10:15:37 +02:00
Givriz
d158716ccc Fix : correction de commentaires
Correction de commentaires (passage de français à anglais ou correction d'un mauvais anglais). Il reste beaucoup à faire, mais je fais un premier PR pour vérifier que cela marche.
2020-10-12 17:41:03 +02:00
Laurent Destailleur
a23a91a4b9
Merge pull request #14971 from TobiasSekan/GlobalPaymentSearch
NEW: Add global search for customer payments and vendor payments
2020-10-09 13:56:52 +02:00
Laurent Destailleur
fe2e41527a Fix sql error 2020-10-09 10:28:26 +02:00
Laurent Destailleur
ec28a4fcdc More info on tooltip 2020-10-09 10:21:07 +02:00
Sekan, Tobias
35fbc602ee Add global payment search 2020-10-09 09:22:26 +02:00
Laurent Destailleur
ad5641dc76
Merge pull request #14951 from TobiasSekan/SelectableColumnsOnSupplierInvoicePaymentList
NEW Select-able columns on supplier invoice payment list
2020-10-07 15:19:19 +02:00
stickler-ci
85b7458b02 Fixing style errors. 2020-10-07 09:24:37 +00:00
Sekan, Tobias
29ee420f3e Selectable columns on sup. invoice payment list 2020-10-07 11:18:31 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
Laurent Destailleur
9d79e984dd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/stock/tpl/stockcorrection.tpl.php
2020-08-06 02:15:04 +02:00
Laurent Destailleur
4785e84c43 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
2020-08-06 02:10:17 +02:00
Laurent Destailleur
2fd430bd2c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-08-06 02:08:44 +02:00
Laurent Destailleur
375fe3f3e8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/fourn/paiement/card.php
2020-08-06 02:08:04 +02:00
Laurent Destailleur
c8bff3a71e FIX Cannot redeclare class 2020-08-06 02:05:04 +02:00
Laurent Destailleur
7d3c176727 Prepare convertion of field "montant" into "amount" 2020-06-17 12:45:56 +02:00
Frédéric FRANCE
b41ac00b98
add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
f5688b2eec
add new rule 2020-05-21 01:52:25 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
68c971a2b5 All properties 'type_libelle' were renamed into 'type_label'. 2019-11-02 11:12:57 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Laurent Destailleur
fbd490da15 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-09 13:29:47 +01:00
Laurent Destailleur
d1e062cafa FIX When changing date of payment, change also record in bank if not
conciliated yet.
2019-01-09 13:28:12 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
be4dc40dfa Fix standardize date format for payment between customer and supplier 2018-11-20 10:16:54 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Alexey Pyltsyn
49de7a5881 Replace multiple load calls with loadLangs method 2018-10-01 09:22:23 +03:00
Philippe GRAND
f1f64db4dc standardize code 2018-08-13 10:20:21 +02:00
Laurent Destailleur
69adf73f4f Clean code from $var = True 2018-04-22 19:27:37 +02:00
Laurent Destailleur
e56d74f5c4 Fix generation of doc for supplier payment 2018-01-11 19:01:47 +01:00
Laurent Destailleur
6a3dc91414 Standardize code 2017-11-23 15:22:32 +01:00
Laurent Destailleur
7f85d73001 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/card.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/contrat/card.php
	htdocs/expensereport/card.php
	htdocs/fichinter/list.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/card.php
	htdocs/fourn/paiement/card.php
	htdocs/livraison/card.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/societe/rib.php
	htdocs/supplier_proposal/list.php
	htdocs/user/card.php
2017-10-18 19:51:29 +02:00
Laurent Destailleur
8626d6279a Fix perm to delete files 2017-10-18 17:21:30 +02:00
Laurent Destailleur
5092c41d94 Look and feel v6 2017-10-13 20:04:11 +02:00
Scrutinizer Auto-Fixer
328d39bc71 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2017-10-07 11:09:31 +00:00
Laurent Destailleur
ef3d86333c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/projet/activity/perday.php
2017-10-06 12:38:50 +02:00
tarrsalah
7767f03e9c WIP: reuse actions_builddoc to build/remove supplier payment doc. 2017-10-05 10:44:08 +01:00
Laurent Destailleur
e3da4188e2 GETPOST must not clean data for text input. 2017-09-25 00:16:52 +02:00
Laurent Destailleur
149ab80b3a The event array of an object is visible even if no event yet recorded. 2017-09-13 14:18:36 +02:00
Laurent Destailleur
6f82837b0f Fix GETPOST of lang_id 2017-06-27 17:27:01 +02:00
Laurent Destailleur
cfde27820e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/translation.php
	htdocs/comm/card.php
	htdocs/core/menus/standard/eldy.lib.php
2017-04-27 17:20:40 +02:00
Maxime Kohlhaas
6c5b329dd1 Fix : display bank on supplier payment as on customer payment 2017-04-14 14:51:39 +02:00
Laurent Destailleur
39ebaec064 Replace usage of $bc[$var] with class="oddeven" 2017-04-14 11:22:48 +02:00
Laurent Destailleur
216bce608d Work on v6 look and feel 2017-04-06 23:28:06 +02:00
arnaud
977c18513d FIX pdf supplier payment work 2017-02-14 12:00:56 +01:00
arnaud
4230b075c2 INIT pdf supplier payment 2017-02-10 17:28:00 +01:00
Laurent Destailleur
5acd09b2d5 Fix require_once instead of require. 2016-11-24 17:03:18 +01:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Frédéric FRANCE
0f5870fcf9 Update card.php 2016-01-09 10:42:03 +01:00
Laurent Destailleur
d6c5a73264 Fix missing payment fields definition in export 2016-01-06 17:37:01 +01:00
philippe grand
fc8c12d6f6 [Qual] Uniformize code 2015-12-10 16:14:37 +01:00
Laurent Destailleur
b61c475aa8 Clean code for validate permissions. "validate" is a status to say, "now
it exists, it is no more a draft", so by default we don't need this
permissions (it is same than create). We keep "validate" permissions as
an "advanced" permission only.
2015-01-25 21:32:40 +01:00
Laurent Destailleur
dda12003d4 Fixed: User of creation was not visible. 2015-01-10 12:23:15 +01:00
Frédéric FRANCE
486d24b8db Fix Typo 2014-11-23 17:43:06 +01:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name"
everywhere.
2014-10-04 17:20:17 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Laurent Destailleur
83447243ae Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	build/debian/get-orig-source.sh
	htdocs/product/class/product.class.php
	htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	build/debian/control
	htdocs/compta/bank/account.php
	htdocs/fourn/paiement/fiche.php
	htdocs/product/class/product.class.php
	htdocs/product/fiche.php
2014-09-15 22:52:59 +02:00
Marcos García de La Fuente
9426298b95 [ bug #1548 ] Supplier payment card shows type in French 2014-09-14 14:19:46 +02:00
Marcos García de La Fuente
434bb1bec7 Migrated old message notifications to the """new""" system 2014-07-20 00:10:40 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02:00
philippe
18080deb93 Fix num paiement was not displayed 2014-06-13 12:16:49 +02:00
philippe
d508c076e8 Fix : num paiement was not displayed 2014-06-13 12:10:26 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Marcos García de La Fuente
917ddf0dee Payments and Supplier payment pages tabs can now be extended from modules. 2013-12-25 03:16:57 +01:00
Laurent Destailleur
a8f784083c Show ref with label on bank account. 2013-10-16 19:00:00 +02:00
Laurent Destailleur
94c376bf37 Fix: Edit payment date 2013-10-16 17:55:15 +02:00
Laurent Destailleur
74a50d8d6c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-07 19:51:00 +02:00
Laurent Destailleur
1c62d2a475 Fix: Ref not visible into page 2013-09-07 19:11:54 +02:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Grand Philippe
e2623c6ad5 try to fix :supplier invoice numbering 2013-04-01 16:04:15 +02:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
e19f8c54f1 Fix: strict mode hurricane 2012-09-15 10:01:35 +02:00
Marcos García
4209898d20 Lower-cased Header function 2012-08-31 05:58:38 +02:00