Commit Graph

2154 Commits

Author SHA1 Message Date
Laurent Destailleur
6f91b8019f Remove warnings 2018-04-13 17:54:27 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
All-3kcis
880fa55dd5 display user-friendly filesize 2018-04-12 15:29:22 +02:00
Laurent Destailleur
7108f68db9 Remove old deprecated hook insertExtraFields. Triggers must be used for
action on CRUD events.
2018-04-10 12:03:01 +02:00
Laurent Destailleur
99ed9c4589 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/compta/facture/list.php
2018-04-08 13:10:10 +02:00
Laurent Destailleur
79af10fc83 Fix search filters 2018-04-08 13:01:42 +02:00
Laurent Destailleur
e7d69b18bd
Merge pull request #8504 from ATM-Nicolas/develop
NEW : Add link between credit note invoice and origin
2018-04-06 09:15:02 +02:00
TuxGasy
47dcc0d5c6 fix notrigger ignored on BILL_CREATE 2018-04-05 18:32:41 +02:00
Laurent Destailleur
9892a97424
Merge pull request #8509 from tuxgasy/5.0_notrigger_BILL_CREATE
fix notrigger ignored on BILL_CREATE
2018-04-05 18:27:45 +02:00
Laurent Destailleur
2d547abaa9
Merge pull request #8498 from atm-john/New_import_lines_from_linked_element
New import lines from linked element
2018-04-05 18:26:47 +02:00
Laurent Destailleur
9d9f3ddf85
Merge pull request #8502 from ATM-Marc/NEW_create_from_list
NEW: generalize use of button to create new element from list
2018-04-05 16:40:15 +02:00
TuxGasy
e5664f9630 fix notrigger ignored on BILL_CREATE 2018-04-04 20:32:36 +02:00
ATM-Nicolas
b9a91c667f NEW : Add link between credit note invoice and origin 2018-04-04 09:33:59 +02:00
John
d689e88b92 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into New_import_lines_from_linked_element 2018-04-03 11:38:12 +02:00
Laurent Destailleur
2d3a55a6a8 Restore broken confirmation popup 2018-03-31 23:39:08 +02:00
Laurent Destailleur
927d86f27f Revert "NEW: formconfirm in javascript"
This reverts commit 50790d5527.
2018-03-31 23:10:12 +02:00
Laurent Destailleur
43f8834b28 Uniformize code with the new module builder framework 2018-03-31 18:48:27 +02:00
Marc de Lima Lucio
0366e645d5 NEW: generalize button to create object from list, for most of the lists 2018-03-30 16:54:38 +02:00
Laurent Destailleur
7c394733e4
Merge pull request #8445 from ATM-Consulting/develop_atm
NEW: bank reconcile: checkbox to select all bank operations
2018-03-29 14:49:41 +02:00
Alexandre SPANGARO
6e27da605a Add label project in tooltip in customer/supplier list 2018-03-27 21:41:25 +02:00
Marc de Lima Lucio
50790d5527 NEW: formconfirm in javascript 2018-03-23 16:54:33 +01:00
Laurent Destailleur
171ad5dce2 Enhance code for template invoices 2018-03-22 21:42:19 +01:00
Laurent Destailleur
9980a5fbd0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
2018-03-22 14:08:43 +01:00
Laurent Destailleur
227b830aa2 Fix visible rounding of abandonned amount 2018-03-22 09:41:30 +01:00
Laurent Destailleur
12068f9cf3
Merge branch 'develop' into 8.0-a7 2018-03-19 12:18:18 +01:00
Laurent Destailleur
d4ae0395ed NEW Look and feel v8: Use a different picto for delete and unlink 2018-03-18 19:13:42 +01:00
Laurent Destailleur
07fb29f0c4 Fix var not initialized 2018-03-16 12:18:20 +01:00
Laurent Destailleur
1716ac5f44 Fix var not initialized 2018-03-16 01:05:49 +01:00
Laurent Destailleur
98b7d4c2e2 NEW Can set the start/end date of service line in invoice templates 2018-03-12 12:27:40 +01:00
Laurent Destailleur
93f4d6fdcd Translation 2018-03-11 21:34:38 +01:00
Laurent Destailleur
390618db47 Fix bad space 2018-03-10 22:42:28 +01:00
Laurent Destailleur
bdb6a09762 Fix phpcs 2018-03-10 22:41:57 +01:00
Laurent Destailleur
b0bd8cf910
Update facture.class.php 2018-03-10 12:56:19 +01:00
florian HENRY
40fb803ffd scrunitizer 2018-03-10 09:34:33 +01:00
florian HENRY
63fb53159c fix scrunitizer 2018-03-10 01:12:47 +01:00
Laurent Destailleur
20ec269d4d
Merge pull request #8318 from atm-florian/7.0_betterthirdpartylink
7.0 betterthirdpartylink
2018-03-09 23:03:23 +01:00
Laurent Destailleur
d8d13a7348
Merge branch 'develop' into 7.0_fix_invoicelist 2018-03-09 22:37:20 +01:00
florian HENRY
a34709c112 fix better thirdparty link 2018-03-09 22:36:00 +01:00
florian HENRY
164ca682d5 fix add "late" invoice into "save last search/backtolist" feature 2018-03-09 17:23:43 +01:00
Regis Houssin
82057b3523 Fix: use code instead id 2018-03-09 08:11:02 +01:00
Laurent Destailleur
1c9e7145e7
Merge pull request #8276 from ATM-Consulting/develop_atm
NEW: supplier credit notes & discounts (absolute and relative)
2018-03-08 20:06:37 +01:00
Regis Houssin
861a831e24 Fix: debug 2018-03-08 11:53:46 +01:00
Regis Houssin
fd9c79fa7f Fix: use getEntity if no rowid to compare 2018-03-08 07:42:17 +01:00
Regis Houssin
93a9430e49 Fix: regression, restore primary key 2018-03-08 07:41:54 +01:00
Alexandre SPANGARO
0182b724aa Merge remote-tracking branch 'uptream/develop' into 8.0-a7 2018-03-08 06:53:54 +01:00
Alexandre SPANGARO
3f2aa6a4fb New : On invoice card, show accounting account linked 2018-03-08 06:52:31 +01:00
Laurent Destailleur
fe45e82e99 Fix use of table llx_c_paiement (param showempty was not used/set) 2018-03-07 19:00:38 +01:00
Laurent Destailleur
c1497b065c CSS 2018-03-07 14:13:55 +01:00
Laurent Destailleur
1ca5c7083a Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formother.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
2018-03-07 11:54:48 +01:00