Commit Graph

56461 Commits

Author SHA1 Message Date
Laurent Destailleur
4758c82d41 Solve minor translation 2016-04-26 09:45:19 +02:00
nka11
c8432fcccd Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into restler3.0.0RC6 2016-04-26 07:37:58 +02:00
nka11
56d25a7c2b Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into fix_5053 2016-04-26 07:31:00 +02:00
Laurent Destailleur
a2a5fa6f4f Update screenshots 2016-04-26 01:13:55 +02:00
Alexis Algoud
91bea8b9fe fix inclusion 2016-04-25 18:54:28 +02:00
Alexis Algoud
bf1f805bf6 FIX trad 2016-04-25 18:40:38 +02:00
Alexis Algoud
b46c14812c Merge branch 'NEW_decrease_stock_expedition_classify' of github.com:atm-alexis/dolibarr into develop 2016-04-25 18:37:47 +02:00
Alexis Algoud
b472a244db NEW decrease stock on expedition closing/classifying 2016-04-25 18:33:39 +02:00
Alexis Algoud
7658a86bc9 NEW show detail per warehouse into reassort 2016-04-25 15:34:54 +02:00
Francis Appels
11c31667b8 Update product.class.php
Fix updatePrice syslog. 
Is travis still running phpunit tests?
2016-04-25 15:04:33 +02:00
fappels
6bf52558e4 Fix #5100 Develop unable to create new third party
Only set fk_stcomm if available
Do not set 'null' into float databasefield
2016-04-25 12:13:28 +02:00
Christophe Battarel
2a0c508d47 FIX: end of select when no fournprice 2016-04-25 11:26:13 +02:00
Alexis Algoud
1746f8f96c FIX search on date into supplier invoice list dont work because of status -1 2016-04-25 11:25:49 +02:00
Laurent Destailleur
c73f4e5d7b FIX Project was lost when creating invoice from a template
Can set project on invoice during creation of invoice from a template
Replace duplicated code to show lines with mutualized code
2016-04-24 20:00:00 +02:00
fappels
93fd994435 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop 2016-04-24 19:37:06 +02:00
Laurent Destailleur
ccdbf69cd5 Bette explanation on how to create an repeatable invoice 2016-04-24 18:11:19 +02:00
aspangaro
d0b2068ab1 FIX: Accountancy - Upgrade Cegid Bank export 2016-04-24 14:41:14 +02:00
Maxime Kohlhaas
02aa3f5688 Debug double conf 2016-04-24 12:14:03 +02:00
nka11
8b92e552a3 fix #5053 and bogus 051c5f4 2016-04-24 09:55:19 +02:00
aspangaro
f5c1406beb FIX: Accountancy - Fix on bank journal to support subcription 2016-04-24 06:10:15 +02:00
BENKE Charlie
dde4f7ed85 minor error code 2016-04-24 02:01:29 +02:00
Laurent Destailleur
bcb4b2b607 Work on website module 2016-04-23 21:34:10 +02:00
BENKE Charlie
961c086be3 </option> not present in some select list 2016-04-23 20:17:45 +02:00
Marcos García de La Fuente
82ee964c27 NEW #4972 Translated Charges sociales (type 0) and Charges sociales (type 1) in reports page
Close #4972
2016-04-23 18:22:11 +02:00
Maxime Kohlhaas
651213123f Oups missing $conf 2016-04-23 17:45:38 +02:00
Maxime Kohlhaas
2c6f58e689 Add choices in PDF admin page 2016-04-23 17:37:12 +02:00
Maxime Kohlhaas
930b4a9be0 New var name 2016-04-23 17:36:55 +02:00
Laurent Destailleur
1a883d870b Uniformize style 2016-04-23 17:35:33 +02:00
Maxime Kohlhaas
ad26fb2824 New option to show details in pdf page foot 2016-04-23 17:23:44 +02:00
Maxime Kohlhaas
0358db0065 Fix use of details in pdf foot 2016-04-23 17:10:56 +02:00
Laurent Destailleur
9d21b63562 Beautify a page 2016-04-23 16:55:08 +02:00
Laurent Destailleur
00a658143d NEW List of user in agenda view per user show photo thumb 2016-04-23 16:51:22 +02:00
Maxime Kohlhaas
179022b129 Fix country and state were not properly updated after ziptown selection 2016-04-23 16:49:43 +02:00
aspangaro
c652d5b02d NEW: Loan - Add list to select accounting account in admin 2016-04-23 16:06:33 +02:00
Maxime Kohlhaas
c5787a4bba New add remain to pay column in invoice list (was present in previous versions) 2016-04-23 16:02:18 +02:00
aspangaro
1454f5cafa FIX: Accountancy - Table account integer 0 by default 2016-04-23 15:44:31 +02:00
aspangaro
04fd5a20ef FIX: Accountancy Work on categories for Report - Add french example 2016-04-23 15:43:28 +02:00
Laurent Destailleur
b639849a47 Page for proposals must be called card.php (one of last architecture
change before the freeze)
2016-04-23 15:37:22 +02:00
Marcos García de La Fuente
d98e50e661 Little change 2016-04-23 13:44:43 +02:00
Marcos García de La Fuente
867649e922 FIX #4813 Won translation for the key OppStatusWON instead OppStatusWIN
Close #4813
2016-04-23 13:36:12 +02:00
Marcos García de La Fuente
f195107bd1 Fixed undefined $user variable in Account::countAccountToReconcile 2016-04-23 13:25:23 +02:00
Maxime Kohlhaas
4e42e73f60 New add stats on interventions 2016-04-23 13:16:19 +02:00
Maxime Kohlhaas
df4d016684 New add stats on contacts 2016-04-23 13:06:46 +02:00
aspangaro
2a7c7a0748 Same problem on bank 2016-04-23 08:09:38 +02:00
aspangaro
8f9c3f96cf Merge remote-tracking branch 'Upstream/develop' into 4.0-p21 2016-04-23 07:07:15 +02:00
aspangaro
a8aeba3ade FIX: For external api, don't use lengt_accountg without module accountancy activated 2016-04-23 07:05:16 +02:00
Laurent Destailleur
5bfc65676c Merge remote-tracking branch 'origin/3.9' into develop
Conflicts:
	ChangeLog
	htdocs/commande/class/commande.class.php
	htdocs/filefunc.inc.php
	htdocs/theme/eldy/style.css.php
2016-04-22 21:02:20 +02:00
Laurent Destailleur
3278c8245b Merge pull request #5020 from frederic34/swiftmailer
Add Swift Mailer to send mails
2016-04-22 20:12:58 +02:00
Laurent Destailleur
f96f8eac85 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-04-22 20:09:51 +02:00
Laurent Destailleur
980f3d522f Prepare 3.9.1 2016-04-22 20:09:42 +02:00