Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 12:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
69,068 Commits 36 Branches 190 Tags
cefaeb583ff12ad09c836fcbf6b39d01209e901b
Commit Graph

1024 Commits

Author SHA1 Message Date
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
Philippe GRAND
d156e1ba82 form should be outside table 2014-11-28 12:51:08 +01:00
Philippe GRAND
15311fb643 form should not be inside table 2014-11-28 12:41:53 +01:00
aspangaro
c4c69e191b Replace <center> tags 2014-11-25 20:13:43 +01:00
Frédéric FRANCE
199239ac8b Update /accountancy/bookeeping/list.php 2014-11-23 17:44:53 +01:00
Frédéric FRANCE
b6824877e5 Update /accountancy/admin/account.php 2014-11-23 17:44:49 +01:00
Frédéric FRANCE
e1addea6db Update /accountancy/bookeeping/list.php 2014-11-23 09:59:05 +01:00
Frédéric FRANCE
5f11354547 Update /accountancy/admin/account.php 2014-11-23 09:58:19 +01:00
Laurent Destailleur
671243e8f6 Fixed: Bugs reported by scrutinizer 
Fixed: Solve conflict between ->iban and ->iban_prefix.
 2014-11-22 16:57:08 +01:00
Laurent Destailleur
31f987706c Fix: bugs reported by scrutinizer 2014-11-17 15:13:23 +01:00
Laurent Destailleur
8d4fc263c5 Fix: Var not defined 2014-11-16 18:37:09 +01:00
Laurent Destailleur
ad661256c0 Fix: Bugs reported by scrutinizer 2014-11-15 16:20:03 +01:00
Laurent Destailleur
d98bfb1d8d Fix: Bugs reported by scrutinizer 2014-11-15 15:19:37 +01:00
aspangaro
4951feeb8f Correct rights & presentation 2014-11-01 07:59:52 +01:00
aspangaro
e43de8b815 Update module accounting 2014-10-31 07:37:59 +01:00
Laurent Destailleur
13090ed778 Merge pull request #1944 from aspangaro/develop-accounting 
Fix :: Button on/off for account in chart of accounts
 2014-10-12 01:38:40 +02:00
Marcos García de La Fuente
f7a44347cb Lowecased booleans to fit with PSR-2 specification. 2014-10-12 00:23:19 +02:00
aspangaro
b8a40a1b32 Presentation 2014-10-08 06:24:46 +02:00
aspangaro
95dc569fe2 Merge remote-tracking branch 'Upstream/develop' into develop-accounting 2014-10-07 20:51:59 +02:00
aspangaro
e8ac6567b7 Fix :: Button on/off for account in chart of accounts 2014-10-07 20:50:57 +02:00
Juanjo Menent
75eb61702e Fix: Showing accounting account fails 2014-10-07 12:46:05 +02:00
Laurent Destailleur
97eec37f1c Uniformize code: property "nom" for thirdparty is aliased into "name" 
everywhere.
 2014-10-04 17:20:17 +02:00
Laurent Destailleur
cb302c16e7 Bad place of code 2014-09-29 16:22:00 +02:00
Laurent Destailleur
d0da5ef047 Merge pull request #1910 from FHenry/develop 
Better accountancy auto find accountancy code feature (work with several
 2014-09-22 23:48:32 +02:00