Commit Graph

895 Commits

Author SHA1 Message Date
Maxime Kohlhaas
383e07d102 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2013-09-26 18:20:12 +02:00
Maxime Kohlhaas
00cb2aa26c Fix : wrong var used in bank account class 2013-09-23 10:55:44 +02:00
Laurent Destailleur
b57ed72fc1 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2013-09-22 20:01:33 +02:00
Laurent Destailleur
53979ad58c Fix: Bad param 2013-09-20 14:29:09 +02:00
Laurent Destailleur
c151ef7b87 Qual: Remove duplicate form instanciation. 2013-09-06 12:10:09 +02:00
Laurent Destailleur
7f549e60f2 Fix: Bad selection of years into graphics 2013-08-27 12:02:33 +02:00
Laurent Destailleur
2336a260d3 New: Add line "minimum amount desired into bank graph". 2013-08-05 18:54:03 +02:00
Laurent Destailleur
37592afa7e New: Add hidden option BANK_DISABLE_DIRECT_INPUT 2013-07-31 18:40:09 +02:00
Laurent Destailleur
de41e9e9c7 Qual: More responsive design 2013-07-26 12:45:31 +02:00
Laurent Destailleur
bf9b255c92 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
2013-07-24 15:25:00 +02:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Maxime Kohlhaas
196bce7e11 Add link to RemiseCheque in account lines 2013-07-19 10:23:08 +02:00
Maxime Kohlhaas
01e4d905fb Start work on bank sharing for multi-company 2013-07-19 09:19:20 +02:00
Laurent Destailleur
4608e07753 Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/compta/bank/account.php
2013-07-13 23:41:32 +02:00
Laurent Destailleur
3a9ffb19c3 fix: eol 2013-07-13 21:14:05 +02:00
Laurent Destailleur
73a33a6dae Fix: Bug to delete bank line 2013-07-13 17:56:23 +02:00
Laurent Destailleur
6db9b67e35 Fix: Missing user param 2013-07-13 17:55:36 +02:00
Laurent Destailleur
d06e9efc0f Fix: Bug to delete bank line 2013-07-13 17:55:14 +02:00
Laurent Destailleur
41cb5ec235 Fix: Missing label 2013-07-13 17:25:10 +02:00
Regis Houssin
4cd6ae6bbd Fix: convert lines delimiters 2013-06-24 17:36:33 +02:00
Regis Houssin
05bd035488 Fix: convert line delimiters 2013-06-24 17:34:22 +02:00
Laurent Destailleur
b49a1168e3 Fix: Use div for tables when there is a different form on each line. 2013-06-23 18:33:03 +02:00
Laurent Destailleur
1d2f09688e Merge remote-tracking branch 'origin/3.4' into develop 2013-06-23 14:38:33 +02:00
Laurent Destailleur
3662638064 Fix: Css for fieldset 2013-06-23 14:37:09 +02:00
Laurent Destailleur
355c770f97 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-23 13:04:00 +02:00
Laurent Destailleur
e5eb5492e9 Fix: W3C 2013-06-23 13:03:06 +02:00
Laurent Destailleur
fc62f6f7d6 Fix: Search filter was lost 2013-06-23 13:00:02 +02:00
Grand Philippe
b599481ef6 standardize code 2013-06-20 09:18:12 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Laurent Destailleur
4133bfc3a4 Fix: Ton of bugs into bank categ editor (W3C, update error, syntax
error...)
2013-05-31 11:15:13 +02:00
Laurent Destailleur
bbb843ec58 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-05-15 19:30:57 +02:00
Laurent Destailleur
85eac29925 New: Add balance before and after column 2013-05-15 19:30:32 +02:00
simnandez
2981d4a1ec Fix: Remove windows CR/LF 2013-05-15 18:14:37 +02:00
Laurent Destailleur
d7e9236455 Fix: Missing include 2013-05-14 01:31:04 +02:00
Laurent Destailleur
559bbdf19a Merge pull request #944 from defrance69/patch-8
Update annuel.php
2013-05-13 15:40:43 -07:00
Laurent Destailleur
2c05d99742 Qual: Uniformize code 2013-05-12 20:10:16 +02:00
Laurent Destailleur
6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/holiday/fiche.php
2013-05-11 15:26:24 +02:00
BENKE Charles
ea130724b1 Update annuel.php
Add Debt and Cred graphic at the bottom of the page
2013-05-10 23:16:41 +02:00
simnandez
bf043fc845 Fix: Remove windows CR/LF 2013-05-08 09:28:05 +02:00
fhenry
37a9686921 Fix bug [ bug #884 ] Warnings on /compta/bank/index.php 2013-05-07 17:06:10 +02:00
Marcos García
44ef25a367 Converted recent changes to UTF-8 encoding 2013-05-06 18:10:41 +02:00
BENKE Charles
5c766d255f Update categ.php
Add update label feature
2013-05-03 16:02:04 +03:00
fhenry
0dbc73a6cc Change-Id: Ie16265e57fa29748fa6c8a1e15ac15ff70786d1d 2013-05-02 22:57:42 +02:00
Laurent Destailleur
5b85adfb90 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/compta/bank/account.php
2013-05-01 02:35:27 +02:00
Laurent Destailleur
d9e01ae63d Fix: Links when transaction is withdraw has disappeared. 2013-05-01 02:33:29 +02:00
Laurent Destailleur
43d64cca1b Fix: Links when transaction is withdraw has disappeared. 2013-05-01 02:28:14 +02:00
Laurent Destailleur
4e0ef01389 Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap 2013-04-25 01:13:13 +02:00
Laurent Destailleur
3896b99bad Add UK with GB. 2013-04-24 19:14:59 +02:00
Regis Houssin
5c50b1db57 Fix: use empty instead isset 2013-04-17 10:42:44 +02:00
Regis Houssin
4c13a4049c Fix: use empty instead isset 2013-04-17 10:41:54 +02:00