Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-26 03:11:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
100,555 Commits 36 Branches 191 Tags
c03958a867d1180e5bcaf99feee94de8acdb334a
Commit Graph

2345 Commits

Author SHA1 Message Date
Laurent Destailleur
11a71d8d2f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
 2021-06-23 11:41:30 +02:00
Laurent Destailleur
034906a129 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
	htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
 2021-06-23 11:30:44 +02:00
Alexandre SPANGARO
c8326c1365 FIX Accoutancy Limit date payment not register on purchases operations 2021-06-20 21:55:48 +02:00
Laurent Destailleur
f850f058fa Look and feel v14 2021-06-16 21:06:55 +02:00
Laurent Destailleur
b28395dd05 Merge pull request #17942 from aspangaro/14a26 
Look & feel v14
 2021-06-16 11:31:16 +02:00
Alexandre SPANGARO
7f0d2b009e FIX SQL Error on automatic binding with functionality "company per entity" activated 2021-06-16 06:23:50 +02:00
Alexandre SPANGARO
e848579495 Look & feel v14 2021-06-16 06:00:00 +02:00
UT from dolibit
77f0645c0e Update index.php 2021-06-15 10:30:58 +02:00
Scrutinizer Auto-Fixer
55c9f37ffa Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-06-14 13:37:02 +00:00
Laurent Destailleur
5cc86d2319 Fix #yogosha6370 2021-06-14 13:51:09 +02:00
Alexandre SPANGARO
cf723d5120 Look a feel v14 CSS Amount 2021-06-13 06:37:44 +02:00
Alexandre SPANGARO
11959ec1ab Fix some date problems 2021-06-13 06:07:01 +02:00
Alexandre SPANGARO
53d0909a7c Merge remote-tracking branch 'upstream/develop' into 14a26 2021-06-12 14:20:00 +02:00
Alexandre SPANGARO
7444ff5412 Update notified 2021-06-12 14:18:44 +02:00
Laurent Destailleur
73a1119b26 Clean code 2021-06-11 15:21:24 +02:00
Laurent Destailleur
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +02:00
Laurent Destailleur
c3ed30345e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-06-04 11:45:24 +02:00
Laurent Destailleur
8e80d65b7e Merge pull request #17765 from softwehrler/fix-subledger-label 
Fix label of subaccount
 2021-06-04 11:42:35 +02:00
Laurent Destailleur
2586fcd1a3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commandestats.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/holiday/month_report.php
	htdocs/product/class/product.class.php
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/societe/list.php
 2021-06-04 11:20:38 +02:00
Laurent Destailleur
6f1c49abcc Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/commande/class/commandestats.class.php
	htdocs/user/class/usergroup.class.php
 2021-06-04 11:04:18 +02:00
Laurent Destailleur
402d90554a Clean code 2021-06-04 10:04:56 +02:00
Laurent Destailleur
9b0605f979 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-06-04 09:41:35 +02:00
Matthias Haberl
fed5db032a Fix label of subaccount 2021-05-28 11:26:55 +02:00
Maxime Kohlhaas
b3a6bcd34f Fix Winfic accountancy export for due date 2021-05-26 15:01:31 +02:00
Maxime Kohlhaas
1d5b8cbb19 Fix Quadra accountancy export for due date 2021-05-26 14:59:28 +02:00
Laurent Destailleur
988660025a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-25 20:32:42 +02:00
Laurent Destailleur
a09db63c7b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/contrat/list.php
	htdocs/don/class/api_donations.class.php
	htdocs/societe/class/societe.class.php
 2021-05-25 20:17:54 +02:00
Laurent Destailleur
1b5f7b78b5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-25 20:12:34 +02:00
Laurent Destailleur
2cb8401921 Merge pull request #17695 from aspangaro/14b10 
NEW Add hook on balance list
 2021-05-25 19:38:24 +02:00
Laurent Destailleur
6d637bf1e1 Merge pull request #17707 from FHenry/12_fix_export_balance 
fix: export balance with double quote
 2021-05-25 19:36:57 +02:00
Laurent Destailleur
d18fc6ca3c Fix init 2021-05-25 15:38:12 +02:00
Florian HENRY
7d223beae5 fix: export balance with doublequote 2021-05-24 12:51:58 +02:00
Alexandre SPANGARO
ac9d9e9314 NEW Add hook on balance list 2021-05-21 07:04:58 +02:00
Laurent Destailleur
dd00feae00 Clean code 2021-05-12 08:57:06 +02:00
Laurent Destailleur
aa05788d62 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/compta/bank/class/account.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/security.lib.php
	htdocs/core/modules/societe/mod_codeclient_elephant.php
	htdocs/filefunc.inc.php
	test/phpunit/CodingPhpTest.php
 2021-05-11 20:34:46 +02:00
ksar
107374748e FIX #13955 2021-05-10 15:42:24 +02:00
Laurent Destailleur
03e8f2aee1 Fix for performance troubles 2021-05-03 18:49:37 +02:00
Laurent Destailleur
28b1d83ae9 Make some performance enhancements 2021-05-03 18:29:21 +02:00
Laurent Destailleur
49a0304071 Add TODO 2021-05-03 16:48:40 +02:00
Laurent Destailleur
6ef463f688 Code comment 2021-05-03 13:54:26 +02:00
Laurent Destailleur
42c2fb5736 Fix sql error on new filter 2021-05-03 13:47:26 +02:00
Laurent Destailleur
1c61d2df9f Merge pull request #17455 from aspangaro/14a42 
NEW Accountancy - Possibility to select journals in balance
 2021-05-03 13:36:08 +02:00
Laurent Destailleur
a806a18455 Reduce sql 2021-05-03 13:35:10 +02:00
Laurent Destailleur
097ccdab9f Merge pull request #17454 from aspangaro/14a30 
NEW Accountancy - Add select date from/to in binding page
 2021-05-03 13:19:12 +02:00
Laurent Destailleur
e9ed985e18 Fix filter 2021-05-03 12:47:40 +02:00
Laurent Destailleur
39e27b6f38 Minor perf enhancement 2021-05-03 12:32:31 +02:00
Laurent Destailleur
d7e445efbd Better doc 2021-05-03 12:01:26 +02:00
Laurent Destailleur
9c0d4dd86b Small performance enhancement for transfer in accountancy. 2021-05-03 11:31:16 +02:00
Laurent Destailleur
2a47128e2d Code comment 2021-05-03 11:00:41 +02:00
Alexandre SPANGARO
8eddc75a22 Remove duplicate variable 2021-05-02 02:49:53 +02:00