Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-19 16:01:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
72,480 Commits 36 Branches 190 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

8505 Commits

Author SHA1 Message Date
Laurent Destailleur
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
 2016-10-01 18:42:50 +02:00
Laurent Destailleur
03c60f1b7d FIX #5802 Incoterms not set 2016-10-01 13:55:07 +02:00
Laurent Destailleur
5c9fa28e79 Fix search on invoice type 2016-09-29 10:38:15 +02:00
gauthier
03d126810c FIX : "reopen " new right must respect advanced user rights management 2016-09-29 10:15:34 +02:00
aspangaro
31511a601d Disable by default 2016-09-29 07:03:39 +02:00
aspangaro
210601f78b New: Add type invoice in customer search list 2016-09-29 07:01:58 +02:00
Laurent Destailleur
b2307f9b90 Uniformize code 2016-09-28 21:08:25 +02:00
Laurent Destailleur
ce1f57786a Merge pull request #5794 from mrsof/develop 
NEW add confirm on reapeatable/template invoice deletion
 2016-09-28 20:01:39 +02:00
Laurent Destailleur
05b1528029 Merge pull request #5800 from atm-gauthier/NEW_filters_on_ca_report 
NEW : add fields and filters on ca by third report
 2016-09-28 20:00:16 +02:00
Laurent Destailleur
e4f17c8763 FIX #5793 Normalise code. 2016-09-28 17:56:54 +02:00
gauthier
e82f65cef2 NEW : add field and filters on ca by third report 2016-09-27 17:38:54 +02:00
Sof
23dffa33a6 Fix : email adress 2016-09-26 19:32:31 +02:00
Sof
86a06de015 New : add confirm on invoice deletion 
Alternatively reformated all code
 2016-09-26 19:29:54 +02:00
gauthier
ad03bdf3b9 FIX : reopen invoice is an advanced right and default value is 1 2016-09-26 17:39:46 +02:00
Laurent Destailleur
e92184a738 Fix bad var $db 2016-09-26 14:55:36 +02:00
Laurent Destailleur
9b26db4151 Fix remove var_dump 2016-09-26 14:55:10 +02:00
Laurent Destailleur
6232e59fd2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-26 14:17:36 +02:00
Laurent Destailleur
b50d92e712 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/compta/localtax/index.php
 2016-09-26 14:16:53 +02:00
Laurent Destailleur
5d7f182f59 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-26 14:14:56 +02:00
Laurent Destailleur
67a1bf2b59 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2016-09-26 14:13:26 +02:00
Laurent Destailleur
3cb13e16d1 Merge branch 'rest-api-add-accounts' of 
https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-rest-api-add-accounts

Conflicts:
	htdocs/api/index.php
	htdocs/commande/class/api_orders.class.php
 2016-09-26 02:28:16 +02:00
Laurent Destailleur
d39d7d92c9 Uniformize code. 2016-09-26 02:13:58 +02:00
Laurent Destailleur
100312aac2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/adherents/class/cotisation.class.php
 2016-09-26 01:32:50 +02:00
Laurent Destailleur
813f9120f6 Merge pull request #5781 from aspangaro/5.0-p15 
Typo "Execuete"
 2016-09-26 00:51:40 +02:00
Laurent Destailleur
ea09eb13da Uniformize code 2016-09-26 00:10:29 +02:00
Xebax
fe2498ffc1 Fix coding style errors. 2016-09-25 19:11:16 +02:00
Xebax
58179f71fc Add Accounts to REST API. 2016-09-25 17:48:48 +02:00
aspangaro
8dc6a8fd1d Correct presentation 2016-09-24 14:47:51 +02:00
aspangaro
922495d72d Correct travis & typo "Execuete" 2016-09-24 07:18:38 +02:00
gauthier
7ad2fda289 NEW : Reopen a paid bill is a user right 2016-09-22 15:06:39 +02:00
Laurent Destailleur
37a0df3277 Merge pull request #5761 from abilbaotm/patch-1 
Fix Syntax error, unrecognized expression: input.remain]
 2016-09-22 09:10:25 +02:00
Laurent Destailleur
d4e324d15a Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture.php
 2016-09-21 18:38:30 +02:00
Laurent Destailleur
d759296c02 Fix color of amount 2016-09-21 01:39:05 +02:00
Laurent Destailleur
1c15539bb4 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-21 01:27:25 +02:00
Laurent Destailleur
133657a8c7 Uniformize code 2016-09-21 01:25:34 +02:00
Laurent Destailleur
b5dad8cfbf Better responsive 2016-09-21 00:29:19 +02:00
Laurent Destailleur
c2f4bc90ab NEW Can sort on status reccurin invoice in list of template invoices. 2016-09-19 16:52:33 +02:00
Laurent Destailleur
64dc44b796 FIX Value of payment term and project are not set on correct default 
value when invoice generated from template.
 2016-09-19 16:27:01 +02:00
Laurent Destailleur
4f842fd2cb Uniformize look and feel 2016-09-19 13:57:50 +02:00
Laurent Destailleur
95f2cae825 Start to work on sepa mandate generation 2016-09-19 00:26:30 +02:00
Laurent Destailleur
c8b8e13014 Work on dol_banner for proposals. 2016-09-18 21:38:20 +02:00
Laurent Destailleur
537c6b0cc7 Uniformize code 2016-09-18 15:57:53 +02:00
Asier Bilbao
0a9fd2dc7e Fix Syntax error, unrecognized expression: input.remain] 
Fix
```
 jquery.min.js?version=4.0.0:2 Uncaught Error: Syntax error, unrecognized expression: input.remain]
```
 2016-09-18 15:51:55 +02:00
Laurent Destailleur
13c3db08e7 Uniformize code and look and feel 2016-09-18 15:48:29 +02:00
Laurent Destailleur
5146a0ce56 Fix filter on num account statement 2016-09-14 21:29:08 +02:00
Laurent Destailleur
145c1e1cc8 NEW Add account statement into fields of bank account transaction list 2016-09-14 21:26:57 +02:00
Laurent Destailleur
630aab9124 NEW Can select fields to show on list of bank transaction 2016-09-14 21:06:16 +02:00
Laurent Destailleur
39d47eab18 NEW Introduce option MAIN_DEFAULT_PAYMENT_TERM_ID to set default payment 
term on company level.
 2016-09-14 11:17:44 +02:00
Laurent Destailleur
2facdda690 Uniformize code 2016-09-12 21:54:45 +02:00
Laurent Destailleur
0ab377440d Complete param of setValueFrom 2016-09-12 20:16:39 +02:00