lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
56,393 Commits 43 Branches 150 Tags 886 MiB
6da82762f2
Commit Graph

447 Commits

Author SHA1 Message Date
Marcos García de La Fuente
87cd6e1e40 Corrected non-static usages of Form::selectarray function 2016-03-20 14:15:17 +01:00
Florian HENRY
72b9b9876f travis 2016-03-15 10:15:45 +01:00
Florian HENRY
6fd218c9aa accoutancy 2016-03-15 09:01:02 +01:00
Florian HENRY
c380faacce Accountancy 2016-03-15 08:58:53 +01:00
Laurent Destailleur
543f5cef63 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	dev/initdata/initdemo.sh
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/commande/card.php
	htdocs/compta/facture.php
 2016-03-13 01:31:12 +01:00
Laurent Destailleur
f345ff7300 Fix regression on vat calculation when invoice was not a situation 
invoice
 2016-03-13 01:11:42 +01:00
Laurent Destailleur
1b30c1adb4 Fix regression on vat calculation when invoice was not a situation 
invoice
 2016-03-12 20:49:38 +01:00
Florian HENRY
d7065751a1 fix error messages 2016-03-11 17:18:25 +01:00
Florian HENRY
33c5658209 fix error return 2016-03-11 17:17:06 +01:00
Florian HENRY
bb06356afb qs 2016-03-10 11:43:07 +01:00
Florian HENRY
e40de3ce28 fix accoutancy 2016-03-10 11:39:26 +01:00
Laurent Destailleur
09a29322c3 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/orderstoinvoice.php
	htdocs/public/demo/index.php
	htdocs/societe/commerciaux.php
 2016-03-08 17:40:21 +01:00
aspangaro
ae472b932c Fix: 3.9rc2 Show accountancy account ventilated instead of the rowid of the account 2016-03-04 20:45:47 +01:00
Laurent Destailleur
4ea00fe1c5 Merge pull request #4725 from aspangaro/3.9-p15 
Fix: 3.9rc2 Show accountancy account ventilated instead of the rowid of the account
 2016-03-04 15:31:25 +01:00
aspangaro
8536841ada Fix: 3.9rc2 Show accountancy account ventilated instead of the orwid of the account. 2016-03-04 10:27:34 +01:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
aspangaro
0136a1742e Spaces !!! 2016-02-27 16:21:59 +01:00
aspangaro
ba6dadb6fa Fix: Use getNomUrl to show account_parent instead of rowid of the account 2016-02-27 16:21:40 +01:00
aspangaro
c907cd139c Lot of corrections 2016-02-27 08:15:58 +01:00
Laurent Destailleur
7aaae143fc Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/expedition/card.php
 2016-02-15 02:01:58 +01:00
Florian HENRY
4401995540 Accountancy feature 2016-02-09 19:22:52 +01:00
Florian HENRY
44e39519b0 add accountancy balance 2016-02-09 19:20:03 +01:00
Florian HENRY
05d7b14786 Accoutancy 2016-02-09 19:11:19 +01:00
Florian HENRY
61dc17f280 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-09 19:07:04 +01:00
Laurent Destailleur
5ea9c6dd83 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.formprojet.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/accountancy.lang
 2016-02-09 14:40:25 +01:00
Florian HENRY
2991084061 fx accountancy 2016-02-08 10:50:40 +01:00
Laurent Destailleur
9da0164d90 Uniformize code for lists 2016-02-07 15:50:48 +01:00
Laurent Destailleur
3a5846ea7f Fix bad link to bank account 2016-02-07 14:45:49 +01:00
aspangaro
eaca582cb5 Fixed: Problem of merging - Review page init accountancy again 2016-02-07 08:47:02 +01:00
Laurent Destailleur
47e2e33fb7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/index.php
	htdocs/accountancy/admin/productaccount.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/menus/init_menu_auguria.sql
 2016-02-03 03:27:17 +01:00
Florian HENRY
c1f084b448 Fix accountancy 2016-02-02 11:11:08 +01:00
Florian HENRY
eb7b71e3ab Fix accountancy 2016-02-02 11:10:38 +01:00
Florian HENRY
2887eb8c70 fix accountancy 2016-02-02 11:02:58 +01:00
Florian HENRY
22ce2872ac Fix journal 2016-02-02 11:01:15 +01:00
Florian HENRY
564594c3d7 Fix accountancy 2016-02-02 10:58:12 +01:00
Florian HENRY
48b191b1ff Fix tuff into accountancy 2016-02-01 15:08:01 +01:00
Florian HENRY
fb5aba6de2 Accountancy 2016-02-01 15:07:12 +01:00
Florian HENRY
65162ae8e9 Accountancy modules 2016-02-01 14:59:13 +01:00
Florian HENRY
165b553a79 Format code 2016-02-01 14:50:25 +01:00
Florian HENRY
7d374c2b02 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/core/class/link.class.php
 2016-01-30 17:32:01 +01:00
Laurent Destailleur
e3a4124a58 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/card.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/langs/fr_FR/bills.lang
 2016-01-30 16:13:06 +01:00
Laurent Destailleur
c4d8c20abb Fix missing include 2016-01-30 14:32:20 +01:00
Laurent Destailleur
c6a6889d79 Merge pull request #4389 from aspangaro/3.9-p6 
Fix: Some problems presentation on accountancy module
 2016-01-30 13:04:22 +01:00
bobby
87284ef9be accoutancy module enhancement 2016-01-28 13:37:09 +01:00
bobby
6aa6c067fb fix travis 2016-01-28 13:24:38 +01:00
bobby
71c407e670 add coala book keeping export 2016-01-25 12:43:47 +01:00
bobby
59f356905a Accoutancy update 2016-01-25 12:42:18 +01:00
bobby
c286c4c6ec Accoutancy update 2016-01-25 12:39:21 +01:00
bobby
50d2665b0e Fix travis 2016-01-23 19:42:40 +01:00
bobby
71a46567ac DEV : Accounting module 2016-01-15 10:44:16 +01:00
bobby
19bec6b0b3 Manual merge from 3.8 backported 2016-01-14 18:24:02 +01:00
aspangaro
cf6be40922 New: #3292 Make sure each and every page displays a title 2016-01-11 22:03:26 +01:00
aspangaro
a88773cb81 Fix: Some problems presentation on accountancy module 2016-01-10 15:44:14 +01:00
Juanjo Menent
c7ae943e57 Merge pull request #4311 from FHenry/develop 
NEW : if nb total of lines provided in print barre_liste, display beside title
 2016-01-09 17:52:05 +01:00
Juanjo Menent
cbf5021161 Merge pull request #4297 from aspangaro/develop-a10 
Accountancy Add a list to select accounting account on accoutancy admin
 2016-01-09 17:46:41 +01:00
Juanjo Menent
095ee47724 Merge pull request #4268 from aspangaro/develop-a7 
Accountancy Review page to init accountancy on product/service
 2016-01-09 17:45:42 +01:00
Juanjo Menent
2bb2f22955 Merge pull request #4252 from aspangaro/develop-a4 
Accountancy Add a list to select accounting account on product card
 2016-01-09 17:41:43 +01:00
aspangaro
2c1ff3ca47 Merge remote-tracking branch 'Upstream/develop' into develop-a7 
Conflicts:
	htdocs/langs/en_US/accountancy.lang
 2015-12-31 06:07:08 +01:00
bobby
46532ccb55 FIX/NEW : Accountancy 2015-12-28 11:08:14 +01:00
aspangaro
6114606c11 Accountancy Add a list to select accounting account on accoutancy admin 2015-12-26 06:26:18 +01:00
Florian HENRY
9441d98890 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-23 14:01:16 +01:00
aspangaro
61208537d8 Merge remote-tracking branch 'Upstream/develop' into develop-a4 2015-12-22 07:13:56 +01:00
aspangaro
ec7cffd6a4 Merge remote-tracking branch 'Upstream/develop' into develop-a7 2015-12-22 07:11:10 +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
Florian HENRY
8006baf592 ry 2015-12-21 13:09:22 +01:00
aspangaro
c7b25ec497 Review page init accountancy 2015-12-21 06:51:46 +01:00
aspangaro
51640c19bb Merge remote-tracking branch 'Upstream/develop' into develop-a4 
Conflicts:
	htdocs/product/card.php
 2015-12-19 05:43:22 +01:00
Laurent Destailleur
f25a9030eb Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	.travis.yml
	htdocs/core/modules/askpricesupplier/doc/pdf_aurore.modules.php
	htdocs/core/modules/commande/doc/pdf_proforma.modules.php
	htdocs/includes/adodbtime/adodb-time.inc.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-18 22:12:03 +01:00
Laurent Destailleur
dd3f5a32d3 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	.travis.yml
	composer.json
	htdocs/accountancy/admin/card.php
 2015-12-18 21:20:12 +01:00
aspangaro
85f87d45df Add select account in product card 2015-12-17 12:57:08 +01:00
aspangaro
c34e698d59 Merge remote-tracking branch 'Upstream/develop' into develop-a4 2015-12-17 06:17:32 +01:00
aspangaro
b064d1106b Accountancy Add a list to select accounting account on product card 2015-12-17 06:16:29 +01:00
Laurent Destailleur
9973315a07 Fix we muste have ($limit = $conf->liste_limite; $offset = $limit * 
$page) and not ($offset = $conf->liste_limite * $page).
In a future $limit that could be overwrite from search post form.
 2015-12-16 19:38:40 +01:00
aspangaro
dfbc2814e7 Fix: Add an empty field for list of parent account - This value can be null 2015-12-15 21:10:53 +01:00
Laurent Destailleur
3b595f0247 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/report.lib.php
	htdocs/langs/en_US/accountancy.lang
 2015-12-13 16:23:33 +01:00
Laurent Destailleur
1a58624775 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-12-11 17:05:38 +01:00
philippe grand
9b0dd8159e [Qual] Close database handler should be after Footer 2015-12-11 12:29:19 +01:00
Florian HENRY
8edf3c65c6 work on accounting 2015-12-11 11:46:22 +01:00
Florian HENRY
b80518efb4 fix travis 2015-12-09 14:26:04 +01:00
Florian HENRY
96a95d6ae1 Debug accountancy on 3.9 2015-12-09 12:55:08 +01:00
Florian HENRY
ea1a81f5f4 FIX : Comptability when multiple account charts 2015-12-09 11:53:38 +01:00
Laurent Destailleur
12702ee128 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/core/lib/report.lib.php
	htdocs/product/stock/class/mouvementstock.class.php
 2015-12-03 12:59:13 +01:00
aspangaro
b1122b55d4 Fix : accountancy code on finance journal is not a constant 2015-11-30 21:07:27 +01:00
aspangaro
37da315af6 Remove old code 2015-11-26 06:30:09 +01:00
aspangaro
9a2259c681 Correct button 'Export' and 'Write bookkeeping' on finance journal 2015-11-26 06:19:24 +01:00
aspangaro
0899e7392b Fix: typo on finance journal 2015-11-22 22:11:22 +01:00
aspangaro
06f752b250 Merge remote-tracking branch 'Upstream/3.7' into 3.7-accountancy 2015-11-16 06:50:04 +01:00
Laurent Destailleur
ab177b43af Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/.gitignore
	htdocs/comm/mailing/card.php
	htdocs/commande/list.php
	htdocs/compta/facture.php
	htdocs/expedition/class/expedition.class.php
 2015-11-13 12:35:10 +01:00
Laurent Destailleur
93be4305c4 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/card.php
	htdocs/accountancy/supplier/list.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/fichinter/card.php
	htdocs/societe/rib.php
 2015-11-13 12:18:46 +01:00
Laurent Destailleur
b3be7f65cd Fix syntax error . = instead of .= 2015-11-13 11:12:49 +01:00
aspangaro
f0a3bca4c2 Fix: Accountancy compatibility with subtotal & jalon module 2015-11-08 04:22:49 +01:00
aspangaro
337643e53e Accountancy : Correct errors of display in bank journal 2015-11-04 22:31:24 +01:00
Laurent Destailleur
7d8fab73e1 Merge pull request #3792 from grandoc/develop 
[Qual] Uniformize code
 2015-10-26 23:03:30 +01:00
Philippe Grand
8fffdae1fb Update index.php 2015-10-23 19:01:50 +02:00
philippe grand
3767ab437e [Qual] Uniformize code 2015-10-23 12:58:30 +02:00
Laurent Destailleur
a5912d1909 Merge pull request #3778 from grandoc/develop 
[Qual] Uniformize code
 2015-10-22 10:39:55 +02:00
Jean-Pierre Morfin
6f37fef05e fix test against empty amount on book update 
- amount < 1 was considered as 0
- 0.00 was not considered as empty so $book->sens was always C
 2015-10-20 14:44:20 +02:00
philippe grand
72491db6b4 [Qual] Uniformize code 2015-10-20 09:31:33 +02:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
aspangaro
f8ade01f0e New : Add payment donation in accountancy expert 2015-10-07 21:48:46 +02:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited 
[Qual] Cleanup of inherited class properties
 2015-09-26 11:23:59 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Laurent Destailleur
94723a9b83 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/langs/en_US/accountancy.lang
 2015-09-12 15:23:02 +02:00
Laurent Destailleur
1ad2aeaf2a Removed baf cut and paste 2015-09-10 01:28:39 +02:00
Laurent Destailleur
a4d0e50175 Merge pull request #3489 from AlainRnet/patch-1 
Update lines.php
 2015-09-10 01:23:13 +02:00
Laurent Destailleur
7fd01d4aa3 Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
	htdocs/compta/paiement/cheque/class/remisecheque.class.php
	htdocs/product/class/html.formproduct.class.php
	htdocs/product/stock/index.php
	htdocs/product/stock/list.php
	htdocs/product/stock/mouvement.php
	htdocs/product/stock/product.php
	htdocs/product/stock/valo.php
 2015-09-09 12:45:22 +02:00
aspangaro
393d528be7 Merge remote-tracking branch 'Upstream/develop' into develop-64 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-09-08 21:17:54 +02:00
aspangaro
710e9327bf Update works 2015-09-07 21:42:12 +02:00
aspangaro
671018c5cc New Accountancy Uniformize code & rename a constant 2015-09-06 21:53:28 +02:00
aspangaro
a4a72d64c0 New: Accountancy Add message when general ledger is witten 2015-09-06 06:43:40 +02:00
aspangaro
b268ccf064 Fix #3455 In advanced accounting module, button transfer to general ledger don't work 2015-09-06 04:52:03 +02:00
aspangaro
ef7df3f261 New: Accountancy rename llx_accountingaccount in llx_accounting_account 
Fix: language key
 2015-09-05 08:03:06 +02:00
AlainRnet
587a193a4d Update lines.php 
- pagination
- prise en compte des filtres lors d'un changement de page
 2015-09-03 16:03:04 +02:00
Laurent Destailleur
ce2e5e7862 Little debug of accounting module 2015-09-03 11:54:03 +02:00
Florian HENRY
a916b75ad8 FIX : Better const usage in accountancy module 2015-08-13 11:32:31 +02:00
Florian HENRY
2775250ce4 Fix TYPE_SITUATION on sell journals 2015-08-13 11:23:27 +02:00
Florian HENRY
6806e2b36b FIX : Accountancy expert module filter on column must not launch ventil 
ventil
 2015-08-13 10:27:35 +02:00
Laurent Destailleur
418a609b73 Fix PHPCS 2015-08-13 03:06:25 +02:00
Florian HENRY
17146fdef7 fix stuff 2015-08-12 16:11:00 +02:00
Florian HENRY
adccd5d04f fix some feature on accountancy modules 2015-08-12 15:53:17 +02:00
Florian HENRY
f2c59405d4 Merge branch 'develop' into develop_darkjeff 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
 2015-08-12 14:23:51 +02:00
Darkjeff
2500e26072 update product account 
clean sql if buy or sell
 2015-08-10 10:29:05 +02:00
Darkjeff
b185cfb85f Update product account 
choose between code sell or code buy
cleaning code
need some tests
 2015-08-06 21:23:02 +02:00
Darkjeff
977b12fac0 clean code customer and supplier accountancy 
celan code add VAT research
 2015-07-28 19:26:46 +02:00
Laurent Destailleur
cb98d6cb93 Merge remote-tracking branch 'origin/3.8' into develop 2015-07-19 15:32:20 +02:00
Laurent Destailleur
eec1f4dcdf Merge pull request #3267 from Dolibarr/3.8 
fix user role and uk_user_api_key if api module not enabled
 2015-07-18 23:51:51 +02:00
aspangaro
b9b6abd7a8 Merge remote-tracking branch 'Upstream/3.8' into 3.8-1 2015-07-18 05:29:57 +02:00
aspangaro
7b1976040d Error 2015-07-17 05:26:32 +02:00
aspangaro
5ce419922d Fix: #3253 #3252 #3251 Remove print_r 2015-07-17 05:22:29 +02:00
aspangaro
59e88590e0 Move my address email to new one 2015-07-15 20:30:33 +02:00
Darkjeff
fbf9e6b4b8 Clean Customer list 
Clean code
Add VAT research
If red line no case check
Remove comments
 2015-07-14 10:06:44 +02:00
Juanjo Menent
f9757bf072 Merge pull request #3176 from aspangaro/develop-patch55 
Fix #3166 : An accounting account can be alphanumeric (Need for EBP)
 2015-07-09 09:45:59 +02:00
aspangaro
600354e057 Update formventilation with elarifr modification 2015-07-09 07:48:09 +02:00
aspangaro
9fdc2991c7 Correct 2015-07-09 07:47:31 +02:00
aspangaro
0b19f2e068 Update list.php with elarifr modification 2015-07-09 07:46:58 +02:00
aspangaro
d286c18148 Update lines.php with elarifr modification 2015-07-09 07:11:08 +02:00
aspangaro
dbb5d3d386 Fix #3166 : An accounting account can be alphanumeric (Need for EBP) 2015-07-08 21:47:45 +02:00
aspangaro
a283d0ce93 Update from elarifr 2015-07-08 07:46:26 +02:00
aspangaro
4c72567c6b Update bookkeeping 2015-07-08 07:19:23 +02:00
aspangaro
787d2310c1 Correct language key 2015-07-07 05:57:35 +02:00
aspangaro
fc3995c0be Accountancy: Bank journal - Show user on salary payment & user new account to pay vat 2015-07-04 16:39:52 +02:00
Laurent Destailleur
97524687c7 Merge pull request #3113 from aspangaro/develop-patch44 
Add getNomUrl on accounting for an account
 2015-07-04 03:40:30 +02:00
aspangaro
a762910f11 Add getNomUrl on accounting for account 2015-06-29 21:16:30 +02:00
aspangaro
9d2e964b00 Fix: print_liste_field_titre(''); 2015-06-26 06:23:29 +02:00
Juanjo Menent
0f6aaf1461 Merge pull request #3094 from aspangaro/develop-patch41 
Accounting - Add field to edit in admin
 2015-06-25 20:42:37 +02:00
aspangaro
e20da5511d Accounting - Add field to edit in admin 2015-06-25 06:54:19 +02:00
aspangaro
452733263d Move ACCOUNTING_VAT_ACCOUNT to ACCOUNTING_VAT_SOLD_ACCOUNT 2015-06-25 06:37:26 +02:00
aspangaro
2ab454e757 Presentation 2015-06-21 14:32:00 +02:00
aspangaro
0f450edfcd Debug 2015-06-21 08:32:37 +02:00
aspangaro
0934860ce5 Accountancy list: Use print_liste_field_titre 2015-06-21 08:26:42 +02:00
Laurent Destailleur
694481ae5e Merge pull request #3071 from aspangaro/develop-patch35 
Review accountancy
 2015-06-19 11:29:01 +02:00
aspangaro
ceaa71649c Review customer list ventilation page 2015-06-19 06:56:21 +02:00
aspangaro
14ad53848d Remove $linkback, lang & html 2015-06-19 06:32:51 +02:00
aspangaro
d959c552f2 Fix: Accountancy - SQL error 2015-06-19 06:01:42 +02:00
Laurent Destailleur
4e5ed08ff8 Clean code 2015-06-12 13:21:21 +02:00
aspangaro
27c0b84a13 Typo on search 2015-05-29 06:54:16 +02:00
aspangaro
fd988ab1f3 Review card of supplier/customer ventilation 2015-05-29 06:43:40 +02:00
aspangaro
47045e0746 Accountancy: Review presentation 2015-05-28 21:34:35 +02:00
aspangaro
58e942681d NEW Forms are using the tab look, even in creation mode 2015-05-20 07:03:17 +02:00
Raphaël Doursenaud
5d2f081152 [Qual] Fixed HTML select form selected attribute 
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected 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
b71e5a1025 Merge pull request #2673 from aternatik/fix_getentity 
Fix : missing getEntity calls
 2015-05-07 00:48:19 +02:00
aspangaro
10a895f1bd Accountancy: add a button to purge search criteria on list 2015-05-05 22:36:48 +02:00
aspangaro
1174c67b07 Accountancy - Add key language & prepare journal for expense report 2015-05-02 06:42:06 +02:00
jfefe
f5db4d5bb7 Fix: missing getEntity function 2015-04-19 03:05:37 +02:00
jfefe
c905f88498 Change generic and setup image title 2015-04-18 23:13:48 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO 
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
 2015-04-12 04:01:28 +02:00
BENKE Charles
e7ed8ce95b Update purchasesjournal.php 2015-03-11 10:23:33 +01:00
BENKE Charles
9fc83ca011 Update sellsjournal.php 2015-03-11 10:23:13 +01:00
BENKE Charles
f91127c92a Update purchasesjournal.php 2015-03-10 21:48:47 +01:00
BENKE Charles
bf86693dcb Update sellsjournal.php 2015-03-10 21:47:39 +01:00
Laurent Destailleur
daabc113a5 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	README.md
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
 2015-02-26 13:36:07 +01:00
aspangaro
4ba095cb5c FIXED: Bankjournal is generated from id_account now 2015-02-22 15:04:18 +01:00
aspangaro
cda6e7adf9 Delete cash journal 2015-02-22 14:20:42 +01: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
Laurent Destailleur
271bcb5313 Merge pull request #2354 from aspangaro/3.7-patch2 
FIXED All constants COMPTA_* was renamed in ACCOUNTING_*
 2015-02-18 23:27:47 +01:00
aspangaro
ebdb96b18c FIXED All constants COMPTA_* was renamed in ACCOUNTING_* 2015-02-13 06:20:08 +01:00
Marcos García de La Fuente
0d150b1d32 Removed unused code, misc corrections and corrected PHPDoc problems. 2015-02-10 10:25:59 +01:00
Laurent Destailleur
011d39105d Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/admin/export.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/datepicker.php
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/fourn/facture/card.php
 2015-02-07 03:28:36 +01:00
aspangaro
14a078c9a7 FIXED Accountancy clean code 2015-02-03 06:39:44 +01:00
Laurent Destailleur
4fdc287717 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/accountancy/customer/card.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/admin/menus.php
	htdocs/fourn/commande/card.php
	htdocs/install/check.php
 2015-01-30 15:53:06 +01:00
aspangaro
68764ccea3 Debug 2015-01-25 15:35:34 +01:00
aspangaro
94a9d0159d Align module with 3.7 & contrary 2015-01-25 15:24:16 +01:00
aspangaro
ae11ab12f6 FIXED Accounting module - Align core & module 3.6 2015-01-25 06:54:17 +01:00
Laurent Destailleur
6bda61436b Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	dev/codesniffer/ruleset.xml
	htdocs/core/class/html.formfile.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/projet/element.php
 2015-01-22 21:52:55 +01:00
Marcos García de La Fuente
be3527abd1 Fixed some errors of Bookkeeping class 2015-01-18 03:23:00 +01:00
Laurent Destailleur
1664b89cef Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-17 19:26:19 +01:00
Laurent Destailleur
007f18bcf7 Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into 
GPCsolutions-review

Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/comm/action/peruser.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/report.lib.php
 2015-01-17 15:11:12 +01:00
Raphaël Doursenaud
50c2b75ef8 Invoices: added situation (or interim) invoices support 2015-01-06 17:12:13 +01:00
Philippe GRAND
3d510ef346 closing tag twice 2014-12-15 11:19:14 +01:00
Philippe GRAND
fedd05cbcc button should be within form 2014-12-15 11:05:47 +01:00
Laurent Destailleur
c3734b1a88 Merge pull request #2103 from grandoc/develop 
add default payment mode select
 2014-12-08 00:03:05 +01:00
Laurent Destailleur
6729544782 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/projet/tasks/task.php
 2014-12-04 14:52:34 +01:00
Laurent Destailleur
3de0702f2b Fixed: All sql requests are now logged 2014-12-04 01:29:01 +01:00
Philippe GRAND
e18196eac6 to avoid undefined method 2014-12-01 16:50:27 +01:00
Philippe GRAND
d7dcd153f0 missing close form 2014-12-01 12:21:54 +01:00
Philippe GRAND
b33612d231 close form should be outside button 2014-12-01 12:09:05 +01:00
Philippe GRAND
9118ef7c8f form should be outside table and close form was twice 2014-12-01 12:03:23 +01:00
Philippe GRAND
cef835cd2d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2014-12-01 11:27:46 +01:00