Commit Graph

136 Commits

Author SHA1 Message Date
Laurent Destailleur
e069da69ba Revert "Fix screen size fall"
This reverts commit abb6b41f91.
2018-12-15 12:35:37 +01:00
Laurent Destailleur
dbe5d285e8 Merge pull request #9965 from atm-john/fix_responsive
FIX screen size fall
2018-12-15 12:33:35 +01:00
Laurent Destailleur
be788e6167 FIX responsive 2018-11-08 19:57:31 +01:00
John BOTELLA
abb6b41f91 Fix screen size fall 2018-11-07 11:25:13 +01:00
Frédéric FRANCE
f24a6ed4d6 loadlangs 2018-05-26 19:03:41 +02:00
Marc de Lima Lucio
6a4a3c9e82 NEW: supplier credit notes: remove MAIN_FEATURES_LEVEL 2018-03-05 10:58:19 +01:00
Marc de Lima Lucio
7ca5ac03cc FIX: discount card: only display relevant discounts types (customer/supplier) 2018-02-26 17:40:31 +01:00
Marc de Lima Lucio
f5ad93b272 NEW: supplier credit notes: handle Excess Paid + translation 2018-02-19 15:52:07 +01:00
Marc de Lima Lucio
fa0c65e37e FIX: supplier credit notes: correctly handle discount split 2018-02-16 12:05:36 +01:00
Marc de Lima Lucio
daca27b2ed NEW: supplier credit notes: split display in thirdparty discount page + fixes + refactoring 2018-02-14 18:02:40 +01:00
Laurent Destailleur
4296df45af Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/projet/list.php
	htdocs/user/card.php
2017-10-13 22:01:56 +02:00
Laurent Destailleur
558f261b60 FIX #7593 2017-10-13 01:03:33 +02:00
Laurent Destailleur
e3da4188e2 GETPOST must not clean data for text input. 2017-09-25 00:16:52 +02:00
Laurent Destailleur
8dfa87fcf6 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-19 19:30:28 +02:00
Laurent Destailleur
f936b17d68 FIX Protection to avoid to apply credit note discount > remain to pay 2017-09-19 00:24:52 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Laurent Destailleur
52c86cb3f5 NEW Bulk actions available on supplier orders 2017-04-09 13:12:25 +02:00
Widee
89716a86a5 Avoid (DEPOSIT) (1) & (2) descriptions
When splitting a rebate into two parts, the word "DEPOSIT" is no longer translated on the invoices.
2017-04-04 12:22:51 +02:00
Laurent Destailleur
b9a9997688 Page societe/soc.php and compta/facture.php was renamed into card.php
to match page naming conventions.
2017-03-20 21:29:22 +01:00
Laurent Destailleur
d72e5a3646 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-02-10 17:34:23 +01:00
Laurent Destailleur
ca67917e80 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
Conflicts:
	htdocs/core/modules/modFacture.class.php
2017-02-10 17:33:32 +01:00
Laurent Destailleur
a4f2325902 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-02-10 17:28:49 +01:00
Laurent Destailleur
b611c5ca53 Merge pull request #6054 from atm-gauthier/develop_NEW_reduc_on_excess_received
NEW Develop new reduc on excess received
2017-02-08 11:16:10 +01:00
fmarcet
d5978a5092 Fix: Wrong vat calculation when split discounts 2017-02-07 14:02:27 +01:00
Laurent Destailleur
60b8582aa9 Fix more then 30 security defects 2016-12-18 01:44:26 +01:00
gauthier
9a1309256d Merge branch 'NEW_reduc_on_excess_received' of github.com:atm-gauthier/dolibarr into develop_NEW_reduc_on_excess_received 2016-11-28 17:13:09 +01:00
gauthier
792e12e6c5 FIX : interface 2016-11-25 11:09:15 +01:00
gauthier
480b08bd0b NEW : convert exceiss received to reduc 2016-11-24 15:48:04 +01:00
Laurent Destailleur
3fbba59f69 Better management of status of events 2016-10-30 13:12:35 +01:00
Regis Houssin
4b8f42949c # WARNING: head commit changed in the meantime
Change-Id: I27dc1da6ca41955468f3661433e41c72a277f670
2016-07-25 21:05:11 +02:00
Laurent Destailleur
774e327831 Merge remote-tracking branch 'origin/3.9' into 4.0
Conflicts:
	htdocs/comm/remx.php
	htdocs/compta/facture.php
	htdocs/langs/en_US/companies.lang
2016-07-21 10:30:51 +02:00
Laurent Destailleur
01c140ecac FIX External user must not be able to edit its discounts 2016-07-20 02:16:10 +02:00
Regis Houssin
ee02ff43d7 Fix: add entity field in llx_societe_remise_except, useful when
third-sharing is used with multicompany
2016-07-07 12:26:30 +02:00
florian HENRY
388bd5ca48 code review 2016-06-30 16:42:49 +02:00
Laurent Destailleur
460d7ce915 FIX Split of credit note into discount page generates records not
correctly recognised as credit note.
2016-05-30 19:38:28 +02:00
philippe grand
30eb08151d [Qual] Close database handler should be after Footer 2015-12-11 14:19:38 +01:00
philippe grand
b34edeb751 [Qual] Uniformize code 2015-11-07 21:56:21 +01:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
Laurent Destailleur
a84ec64ece The new banner tab is available on all tabs of thirdparty. 2015-10-13 13:06:32 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
dabfad1529 [Qual] Replaced deprecated print_titre() 2015-09-24 18:27:13 +02:00
Laurent Destailleur
6624182361 Fix form outside table 2015-08-28 00:29:46 +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
023175b9f1 PHPDoc and misc fixes for several folders 2015-02-10 11:38:13 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
aspangaro
0b20369dd7 Qual: Renamed all files & links "fiche.php" into "card.php" 2014-09-18 21:18:25 +02:00
Marcos García de La Fuente
ac824728bc Migrated old error notifications to the """new""" system 2014-07-20 01:09:43 +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
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00