Commit Graph

301 Commits

Author SHA1 Message Date
aspangaro
d1cafde77d No rowspan needed 2016-10-21 06:39:39 +02:00
aspangaro
ad72a8eed1 Better presentation of invoice payment page 2016-10-21 06:34:02 +02:00
Laurent Destailleur
2592b4cba4 Fix field required only faor cheque payment mode 2016-10-16 21:39:19 +02:00
Laurent Destailleur
28f64e78eb Debug multicurrency 2016-10-13 21:25:13 +02:00
Laurent Destailleur
78e8ab64aa Debug multicurrency 2016-10-13 21:17:46 +02:00
Asier Bilbao
0a9fd2dc7e Fix Syntax error, unrecognized expression: input.remain]
Fix
```
 jquery.min.js?version=4.0.0:2 Uncaught Error: Syntax error, unrecognized expression: input.remain]
```
2016-09-18 15:51:55 +02:00
SAINT-PATRICE
d363205648 Update paiement.php
Test non optimisé
2016-07-26 11:55:26 +02:00
gauthier
b8f5175343 FIX : sql optimisation 2016-06-15 17:16:16 +02:00
gauthier
a0051a856a NEW : conf to allow payments on different thirdparties bills but same parent company 2016-06-15 17:10:42 +02:00
Marcos García de La Fuente
e2c86d3fd8 NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead 2016-04-17 15:24:22 +02:00
Laurent Destailleur
bc1b2d048b Uniformise option name 2016-03-25 18:09:42 +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
89bd173c2f NEW Rename Form::select_date to Form::selectDate and Form::form_date to Form::formDate 2016-03-21 21:51:29 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
phf
a0cfe9aad8 New add payment with multicurrency module 2016-02-10 23:16:38 +01:00
Laurent Destailleur
db7a98f0ef Fix: When a payment mode was disabled, it was not visible on old
records.
Fix: init of $limit not correctly set according to 3.9 rules on most
pages.
2015-12-21 13:56:59 +01:00
philippe grand
f308606ee1 [Qual] Uniformize code 2015-11-15 07:47:35 +01:00
Laurent Destailleur
3906cb79c5 NEW: Add parameter to add a link to use "date of invoice" in one click
when fille a payment card.
2015-11-07 23:46:07 +01:00
Juanjo Menent
03a2fd740d Issue #3509: Ready for customers 2015-10-03 16:58:46 +02:00
Juanjo Menent
ad1a4c7e15 Merge pull request #3598 from GPCsolutions/formconfirm
[Qual] Replaced deprecated form_confirm()
2015-09-26 08:48:16 +02:00
Raphaël Doursenaud
485c369d55 [Qual] Replaced deprecated form_confirm() 2015-09-24 21:10:35 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Laurent Destailleur
a29ca43943 Prepare merge of merge tools and invoice list 2015-06-30 14:32:17 +02:00
aspangaro
9d2e964b00 Fix: print_liste_field_titre(''); 2015-06-26 06:23:29 +02:00
aspangaro
8eee0bdf73 NEW Forms are using the tab look, even in creation mode 2015-05-27 07:41:25 +02:00
Raphaël Doursenaud
b8d9c20731 [Qual] Fixed HTML input form disabled attribute
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form disabled attribute should not have a value.
2015-05-07 14:21:14 +02:00
Raphaël Doursenaud
859d1b0df9 [Qual] Fixed HTML input form checked attribute
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The input form checked attribute should not have a value.
2015-05-07 14:21:14 +02:00
Laurent Destailleur
e3713c8b6d Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/admin/tools/eaccelerator.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Marcos García de La Fuente
0d6d98b395 PHPDoc and misc fixes for several folders 2015-02-10 13:17:37 +01:00
Laurent Destailleur
e220ce5a82 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/comm/card.php
	htdocs/comm/propal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/custom/.gitignore
	htdocs/expedition/card.php
	htdocs/fourn/card.php
	htdocs/product/fournisseurs.php
2015-01-18 18:44:22 +01:00
Laurent Destailleur
5c5ff72ecd Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	ChangeLog
	htdocs/adherents/fiche.php
	htdocs/comm/fiche.php
	htdocs/comm/mailing/fiche.php
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/fiche.php
	htdocs/compta/facture.php
	htdocs/compta/paiement.php
	htdocs/core/class/html.formcompany.class.php
	htdocs/core/tpl/login.tpl.php
	htdocs/expedition/fiche.php
	htdocs/fourn/commande/fiche.php
	htdocs/fourn/facture/fiche.php
	htdocs/fourn/facture/paiement.php
	htdocs/fourn/fiche.php
	htdocs/main.inc.php
	htdocs/product/fournisseurs.php
	htdocs/resource/card.php
2015-01-18 17:13:42 +01:00
Marcos García de La Fuente
7f59cf9194 Fix: [ bug #1787 ] Incorrect behaviour of doActions hook 2015-01-17 19:28:27 +01:00
Raphaël Doursenaud
50c2b75ef8 Invoices: added situation (or interim) invoices support 2015-01-06 17:12:13 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Marcos García de La Fuente
f7a44347cb Lowecased booleans to fit with PSR-2 specification. 2014-10-12 00:23:19 +02:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00
Laurent Destailleur
ec95aacd52 Uniformize code for error reporting after a hook. 2014-09-28 03:41:32 +02:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
aspangaro
9da597d56e Merge remote-tracking branch 'Upstream/develop' into develop 2014-09-18 20:18:56 +02:00
aspangaro
7a9ce455d9 Uniformize code $_SERVER["PHP_SELF"] 2014-09-18 20:13:38 +02:00
Juanjo Menent
90edd96646 Fix: Invoices payments may be older than invoices 2014-09-18 10:11:39 +02:00
Juanjo Menent
ab83e22a12 Fix: Invoices payments may be older than invoices 2014-09-18 09:57:13 +02:00
Andrelec1
49d1983acd trigger on total
Add hook on js for total
2014-08-12 11:40:24 +02:00
Andrelec1
1ce4996a34 finish implement
remove old code and add new one ...
2014-08-12 11:34:53 +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
Laurent Destailleur
55599f9455 Fix: MAIN_AUTOFILL_DATE was broken in some cases. 2014-04-10 19:47:52 +02:00
Laurent Destailleur
e5cd32623c Qual: Uniformize code of payment between customer and supplier payments.
New: Add warning if supplier payment is higher that due amount.
2014-02-03 18:42:24 +01:00
Maxime Kohlhaas
0994184bf9 Fix invoice fetch on payment page 2013-10-14 09:45:32 +02:00
Maxime Kohlhaas
d6da871381 Add object declaration on paiment 2013-10-10 09:31:37 +02:00
Maxime Kohlhaas
4a20a29521 Add hook on paiementcard + fix hook on expedition 2013-09-27 11:00:25 +02:00
simnandez
d228005e17 Fix: Remove windows CR/LF 2013-05-10 17:43:55 +02:00
Alessandro Ponzio
0817d035a3 Updated SQL query that fetches invoices by adding the 'ORDER BY' clause 2013-05-10 14:38:15 +02:00
Maxime Kohlhaas
1381373c95 Fix : set emetteur to MYCOMPANY when payment is a customer 2013-04-18 09:24:29 +02:00
Laurent Destailleur
8e2171b64c Fix: Error management and missing transactions check 2013-04-07 16:39:20 +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
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Grand Philippe
a91a96e72e merge 2012-12-10 10:02:13 +01:00
Maxime Kohlhaas
4cffe3e5a3 Fix : minor html fix + changelog 2012-12-07 11:06:51 +01:00
Laurent Destailleur
5b02ff3a86 Fix: 3 fixes on option MAIN_JS_ON_PAYMENT (css, bad path, removed
forced var)
2012-11-17 19:55:19 +01:00
Regis Houssin
7de5a7fd3f Fix: compatibility with multicompany 2012-11-06 14:56:49 +01:00
Laurent Destailleur
153997432f Fix: Several fix.
New: Also allow to enter a payment with a negative value on an invoice
and positive onto other.
2012-10-13 17:00:38 +02:00
Laurent Destailleur
8ff506b120 Sec: Sanitize all params page, sortfield and sortorder 2012-10-13 14:47:46 +02:00
Regis Houssin
43c0a03758 Fix: strict mode tornado 2012-09-15 11:21:22 +02: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
Regis Houssin
3cdb2ba8e1 Merge pull request #337 from marcosgdf/coding-style
Improved coding style
2012-08-22 22:43:03 -07:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Marcos García
bed4e7bc72 Fixed string being not translated 2012-08-22 22:36:08 +02:00
Laurent Destailleur
8d031900f9 [ bug #464 ] Payment form should allow to add transmitter for bank transfers 2012-07-31 13:40:38 +02:00
Laurent Destailleur
e6cd400bc3 Qual: List of elements must be into a page called "list.php". 2012-06-09 19:16:31 +02:00
Raphaël Doursenaud
e1767d1337 Trim payment amounts
This allows to ignore trailing characters that may triggers a warning because the payment looks greater than what's
required
2012-05-23 12:03:02 +02:00
Laurent Destailleur
1645ddbe47 Sec: Sanitize all input for ids. 2012-02-27 22:26:22 +01:00
Laurent Destailleur
26c597878f Amount at end. 2012-02-03 10:00:57 +01:00
Regis Houssin
3302a86f0c Fix: add entity field in llx_paiement 2012-02-01 18:29:06 +01:00
Regis Houssin
196bb42636 Fix: use MAIN_JS_ON_PAYMENT just for the auto-completion payment 2012-01-15 11:02:08 +01:00
Laurent Destailleur
6a5218b9b2 Qual: Ckeckstyle 2012-01-10 01:31:06 +01:00
Laurent Destailleur
839781dfbe Qual: Removed a TODO by renaming all ->monnaie into ->currency 2011-11-23 14:55:36 +01:00
Regis Houssin
f0c327c070 Fix: uniform code
replace all $html by $form with exceptions "$htmlname, $htmltooltip"
2011-11-08 17:22:31 +08:00
Regis Houssin
ac2d7aab7c Fix: Space found before comma 2011-09-20 09:59:08 +00:00
Regis Houssin
b6a2f13673 Fix: avoid jenkins warning
Fix: SpaceAfterOpenBracket, SpaceAfterCloseBracket, SpaceBeforeCloseBracket, SpaceBeforeOpenBracket
2011-09-20 09:40:27 +00:00
Laurent Destailleur
003911a42d Fix: W3C 2011-09-07 16:48:04 +00:00
Laurent Destailleur
d9971b0bd5 Work on rpm package 2011-09-07 15:31:11 +00:00
Laurent Destailleur
24c5993a47 Fix: W3C 2011-09-07 16:48:04 +00:00
Laurent Destailleur
2bb5e4ba69 Fix: W3C 2011-08-31 15:12:09 +00:00
Regis Houssin
2ecc03104c Fix: remove obsolete tags (in progress) 2011-08-27 15:14:31 +00:00
Regis Houssin
726d9581dd Fix: remove obsolete tags (in progress) 2011-08-27 14:24:16 +00:00
Laurent Destailleur
e58aa3fcb0 Fix: Do not close automatically deposits 2011-08-08 01:01:45 +00:00
Laurent Destailleur
f4606c2253 Fix: Avoid errors into rpm packages 2011-08-03 00:45:22 +00:00
Cyrille de Lambert
26e315c785 improves the simplified payment
MAIN_JS_ON_PAYMENT must be set
2011-07-27 08:00:45 +00:00
Laurent Destailleur
e23713845f Restore hidden param to enable feature for the release 3.1. I suggest to test it during on version untill making it visible by default. 2011-07-13 08:57:21 +00:00
Cyrille de Lambert
e9c69fcb9e Correction paiement Ajax 2011-07-11 09:32:35 +00:00
Cyrille de Lambert
56a295b9c0 *** empty log message *** 2011-07-04 16:39:48 +00:00
Regis Houssin
d6d98bfc45 Fix: jquery payment not stable 2011-07-01 16:18:10 +00:00
Cyrille de Lambert
08d99b584b Modify règlement 2011-07-01 15:19:32 +00:00
Laurent Destailleur
337f41c8e1 Uniformize code 2011-06-17 22:24:52 +00:00
Laurent Destailleur
e1094fc293 Qual: Debug and clean notification module 2011-06-12 18:05:30 +00:00
Regis Houssin
da1bd8ce5f Fix: move this to an external module in Doliforge 2011-05-26 06:17:17 +00:00
Regis Houssin
14c2ee5854 Works on paypal module
Fix: force to credit card
2011-05-25 14:01:42 +00:00
Regis Houssin
4c2866fc57 Works on paypal module
Fix: add transaction id and default bank account
2011-05-25 13:34:12 +00:00
Regis Houssin
be26c52243 Works on paypal module
New: add trigger for fee treatment
2011-05-24 17:28:58 +00:00
Laurent Destailleur
f12075a028 Try to add a patch but keep it with a condition because of several problems. 2011-05-18 18:38:12 +00:00
Laurent Destailleur
1a3c45faea New: task #10969 : Add checkbox to close automatically invoice to "payed" 2011-03-19 13:59:04 +00:00
Laurent Destailleur
8e9b113f4c Autofill cheque writer 2011-02-26 11:08:42 +00:00
Laurent Destailleur
4269814214 New: If there is only one back account and value is mandatory, then value is preselected. 2011-02-05 17:25:56 +00:00
Laurent Destailleur
8655c29d09 Fix: Error message as not visible 2010-12-21 00:44:57 +00:00
Laurent Destailleur
fdf14d0499 Qual: Mutualize and uniformize code 2010-09-19 13:31:54 +00:00
Laurent Destailleur
1918fb582e Mutualize some code 2010-09-09 01:26:07 +00:00
Laurent Destailleur
aec5e4ab52 Mutualize some code 2010-09-08 23:50:52 +00:00
Laurent Destailleur
9b84d746b9 Better error management 2010-08-14 01:52:26 +00:00
Laurent Destailleur
5be0cb859e Fix: Use good payment type 2010-08-14 01:42:59 +00:00
Regis Houssin
aa62559812 Fix: fetch_client is deprecated 2010-08-06 13:56:25 +00:00
Laurent Destailleur
d9e59b0c03 Fix: Value of amount must not be modified during confirm process. 2010-07-17 12:14:02 +00:00
Laurent Destailleur
41ab0b845c Fix: Bad translation 2010-07-13 19:59:21 +00:00
Laurent Destailleur
99382521b3 Qual: Removed pdate 2010-05-08 19:49:29 +00:00
Philippe Grand
c418128a07 according to new tree directory 2010-04-25 14:17:39 +00:00
Philippe Grand
ba3a06758c according to new tree directory 2010-04-25 12:43:27 +00:00
Philippe Grand
b5e43aa11c move paiement.class.php file to compta/paiement/class/ directory 2010-04-25 08:47:08 +00:00
Laurent Destailleur
a175f5992a Fix: Restore integrity management. Note: With postgresql a commit is changed into a rollback when there is at least one error, even if error is correctly managed (example when inserting a duplicate value). Solution is to change code to avoid error (example: select if exists before inserting). 2010-04-17 13:37:24 +00:00
Regis Houssin
3d641b236f Fix: pgsql compatibility
Todo: probleme d'imbrication de begin/commit
2010-04-17 09:17:31 +00:00
Regis Houssin
d7ffb431a7 Fix: pgsql compatibility 2010-04-17 08:22:29 +00:00
Laurent Destailleur
d2aff43936 Remove pre.inc.php 2010-03-27 14:40:39 +00:00
Philippe Grand
3ce3c74ba7 Move facture class file to compta/facture directory 2010-03-26 15:45:01 +00:00
Laurent Destailleur
8e78f75be4 Qual: A lot of screen more clear 2010-02-10 17:07:25 +00:00
Laurent Destailleur
8a37c13365 Look: Use style fieldrequired on mandatory fields 2010-02-04 19:54:58 +00:00
Laurent Destailleur
3cb6df16fd A lot of fix on point of sale module 2009-10-22 00:27:13 +00:00
Laurent Destailleur
f25e136db8 Fix: Fix global typo error 2009-08-19 17:07:48 +00:00
Laurent Destailleur
54da829a83 Look: Minor fix 2009-07-15 19:53:31 +00:00
Regis Houssin
e5d222b6cc Fix: rgression sur l'utilisation des niveau du jeton, on test sur les 2 niveaux car
comportement alatoire avec certaines fonctions
2009-05-17 08:01:54 +00:00
Regis Houssin
c1c1f8a4d2 Fix: ajout d'un niveau supplmentaire du cache du jeton 2009-05-16 15:45:26 +00:00
Regis Houssin
b1e630a3fa Fix: ajout d'un jeton alatoire dans les requetes POST 2009-05-15 14:41:19 +00:00
Juanjo Menent
5df89b2c0a Improve Translations: Payment higher than teminder to pay 2009-05-07 11:01:20 +00:00
Laurent Destailleur
6335fe2b55 Qual: Use a so much simpler way to have ajax confirmation boxes 2009-05-06 15:45:50 +00:00
Laurent Destailleur
7c6016b355 Qual: Use a so much simpler way to have ajax confirmation boxes 2009-05-06 13:39:43 +00:00
Laurent Destailleur
36faecca0d Changes to support deposit invoices 2009-03-02 21:21:49 +00:00
Laurent Destailleur
dbf8418e84 Fist changes to support deposit invoices 2009-02-21 17:43:02 +00:00
Laurent Destailleur
0823322ba1 Qual: All call to dolibarr_ functions are made on dol_ functions. 2009-02-20 22:53:15 +00:00
Laurent Destailleur
1a911fc38a Fix: Pb with floating operations 2008-08-08 22:12:27 +00:00
Laurent Destailleur
74b1f2c4b1 Fix: Remainder to pay wrong on payment page 2008-08-08 18:13:41 +00:00
Laurent Destailleur
7e53645e6e Fix: Remainder to pay wrong on payment page 2008-08-07 17:47:44 +00:00
Laurent Destailleur
6395d1e4fb New: Add option MAIN_AUTOFILL_DATE 2008-07-17 22:11:45 +00:00
Laurent Destailleur
1e1558897e Fix: Payment date was lost 2008-07-06 23:49:12 +00:00
Laurent Destailleur
e3377b1e29 Fix: Error management. Payment date is not preselected to avoid errors. 2008-07-04 10:44:54 +00:00
Laurent Destailleur
52628131a6 Fix: Bad char 2008-02-12 03:25:35 +00:00
Laurent Destailleur
70b1fabf13 Fix: Pb si module banque non actif 2008-01-27 00:16:02 +00:00
Laurent Destailleur
a70ced9753 Oubli du param sortorder dans les appels de print_liste_field_titre 2007-11-11 15:55:45 +00:00
Regis Houssin
e3747861fe Fix: certaine fois la vrification d'un paiement contenant un montant avec un point au lieu d'une virgule indiquait que le paiement tait suprieure alors que c'tait la somme exact. 2007-10-26 18:52:27 +00:00
Regis Houssin
e4f229123c Fix: gestion des erreurs 2007-03-30 15:56:42 +00:00
Laurent Destailleur
a845921850 Suite gestion des avoirs. 2007-03-25 03:07:46 +00:00
Laurent Destailleur
7d7c1e8dc1 Qual: Uniformisation du code. Les dates de paiements dans les objets sont gres au format timestamp
Qual: Ajout de controles sur la saisie d'une transaction bancaire
2007-02-04 21:23:58 +00:00