Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-29 20:23:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 38 Branches 191 Tags
e3a0220658b7dfc05bfb499ace614fda170e4f3b
Commit Graph

12406 Commits

Author SHA1 Message Date
phf
4baff7898d FIX insert FactureLigne 
FIX phpunit PriceTest with new values returned for multicurrency module
NEW add test in PriceTest
FIX FactureTest properties not defined
 2016-01-26 22:18:31 +01:00
Maxime Kohlhaas
6313f64c93 Fix : amount in bank line is necessarily in the account currency 2016-01-26 18:09:52 +01:00
phf
83f90e2b1f Merge branch 'new_multicurrency_module' of github.com:atm-ph/dolibarr into new_multicurrency_module 
Conflicts:
	htdocs/commande/card.php
 2016-01-25 21:50:43 +01:00
phf
373225272b FIX reorder the display of currency and rate on propal/order 
FIX update line on propal/order
NEW add mulitcurrency on customer invoice
 2016-01-23 16:01:55 +01:00
Frédéric FRANCE
4ed2831112 Add fk_bordereau in account statement conciliation 2016-01-22 12:23:13 +01:00
Frédéric FRANCE
4d842d91d7 Add fk_bordereau in account statements 2016-01-22 12:20:03 +01:00
Laurent Destailleur
78ee675993 Merge pull request #4463 from frederic34/patch-9 
Update card.php
 2016-01-22 04:13:13 +01:00
Laurent Destailleur
d8cbe39c46 Merge pull request #4461 from frederic34/patch-8 
total records for payment list
 2016-01-22 04:13:02 +01:00
Laurent Destailleur
d7da972ead Merge pull request #4460 from frederic34/patch-7 
total records for deposit list
 2016-01-22 04:12:49 +01:00
Laurent Destailleur
93b2013aa7 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/projet/tasks/list.php
 2016-01-22 03:29:55 +01:00
Laurent Destailleur
cceeefb7c2 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/societe/index.php
 2016-01-22 03:25:30 +01:00
Laurent Destailleur
600a4e961b Merge pull request #4464 from frederic34/patch-10 
typo
 2016-01-22 02:11:01 +01:00
Frédéric FRANCE
b0530539f4 Update rappro.php 2016-01-20 13:59:56 +01:00
Laurent Destailleur
03461d124a Fix activation of cron jobs by external module 
Clean code for task lists pages.
 2016-01-19 23:45:03 +01:00
BENKE Charlie
2036f17df5 if FAC_FORCE_DATE_VALIDATION can't change the billing date 2016-01-19 21:45:44 +01:00
Frédéric FRANCE
0a7de725b0 typo 2016-01-19 19:08:01 +01:00
Frédéric FRANCE
d242d6ec6d Update card.php 2016-01-19 17:39:21 +01:00
Frédéric FRANCE
b97417f3bf Update list.php 2016-01-19 12:18:29 +01:00
Frédéric FRANCE
6918a425a0 total records for deposit list 2016-01-19 12:15:37 +01:00
Laurent Destailleur
8e882b4cc2 NEW Add warning on tasks when they are late (add also the warning 
tolerance parameter)
 2016-01-18 15:56:51 +01:00
phf
a50a7366cb FIX travis test 2016-01-13 14:04:48 +01:00
phf
d213fbae08 FIX invoice situation 2016-01-13 13:42:58 +01:00
Laurent Destailleur
1b1bd73e6b Merge pull request #4404 from frederic34/patch-8 
FIX When doing payment for money back, bank account was not set by default
 2016-01-12 23:20:32 +01:00
Frédéric FRANCE
92885065c6 Update facture.php 2016-01-12 10:09:02 +01:00
aspangaro
cf6be40922 New: #3292 Make sure each and every page displays a title 2016-01-11 22:03:26 +01:00
Raphaël Doursenaud
7281338f8d FIX #4291 Correctly filter bank card GETPOSTs 2016-01-11 10:51:45 +01:00
Laurent Destailleur
68ef5ef5a8 Merge pull request #4388 from aspangaro/3.9-p5 
Fix: HRM index - typo and presentation
 2016-01-10 18:21:32 +01:00
aspangaro
47f63172e3 Fix: HRM index typo and presentation 2016-01-10 14:58:54 +01:00
Laurent Destailleur
c07cb5a72e Merge pull request #4371 from frederic34/patch-7 
Always show remove button and why we can't remove
 2016-01-10 11:37:56 +01:00
Laurent Destailleur
8653e7fa5c Merge remote-tracking branch 'origin/3.9' into develop 2016-01-10 00:12:51 +01:00
Juanjo Menent
dbd427ea06 Merge pull request #4264 from aspangaro/develop-a6 
Accountancy Add a list to select accounting account on bank account
 2016-01-09 17:42:52 +01:00
Frédéric FRANCE
0c6bd4e617 Update card.php 2016-01-09 10:37:53 +01:00
Laurent Destailleur
a0d11e157b Fix select2 component go over parent container so we introduce option to 
deal this.
 2016-01-08 23:17:45 +01:00
Laurent Destailleur
87c236b534 Fix when error creating invoice from predefined invoice, we must go back 
to create page from same predefined invoice.
 2016-01-08 16:30:43 +01:00
Laurent Destailleur
abe3f192fa Debug and fix when using dolibarr with jmobile 2016-01-03 16:23:23 +01:00
Laurent Destailleur
52cd5d505e Fix several bugs on css, translation or look 2016-01-01 23:44:23 +01:00
Laurent Destailleur
ed3f0ce86b Fix totalnboflines not correctly managed 2015-12-28 00:20:48 +01:00
Laurent Destailleur
6f474c403c Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
	htdocs/societe/notify/card.php
	htdocs/societe/price.php
 2015-12-27 19:15:20 +01:00
Laurent Destailleur
0645938283 FIX #4230 PHP7 error 2015-12-27 18:26:21 +01:00
Marcos García
da959c5cf0 Little typo in commit 8b633ae 2015-12-25 11:32:13 +01:00
Juanjo Menent
c6093fff3e Merge pull request #4289 from marcosgdf/bug-4285 
FIX #4285 SQL query shown when accessing an unexisting invoice
 2015-12-24 22:00:00 +01:00
Juanjo Menent
b9d0fc5aaf Merge pull request #4271 from grandoc/develop 
[Qual] Uniformize code
 2015-12-24 15:43:14 +01:00
Marcos García de La Fuente
de1625b9de FIX #4285 SQL query shown when accessing an unexisting invoice 2015-12-24 14:46:01 +01:00
Marcos García de La Fuente
8b633aee66 FIX #4182 SQL error when deleting an unexisting bank entry 2015-12-24 14:39:28 +01:00
Laurent Destailleur
8c1f271356 Maxi debug of module leave requests. 2015-12-24 12:37:38 +01:00
Laurent Destailleur
559e621fd2 Fix conflict with trigger to delete payment customer and supplier. 2015-12-23 19:54:56 +01:00
philippe grand
1eeee203d7 [Qual] comments should be in english 2015-12-22 09:37:27 +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
Laurent Destailleur
fec5f4e20b Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2015-12-21 12:40:32 +01:00
Laurent Destailleur
0a515ca8c0 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2015-12-21 12:38:23 +01:00