Commit Graph

56461 Commits

Author SHA1 Message Date
Laurent Destailleur
448ca49e28 Fix bad field 2016-04-18 21:10:30 +02:00
Laurent Destailleur
3a807d9cdb Revert a commit. The field was already added. 2016-04-18 21:07:26 +02:00
Laurent Destailleur
a88b3a8cc4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-18 21:02:34 +02:00
Laurent Destailleur
f68f5677bb Start to use the vat code to identify a vat into combo list instead of
just "rate" and "npr".
2016-04-18 21:02:14 +02:00
Juanjo Menent
5a87218622 Merge pull request #5034 from aspangaro/4.0-p19
NEW: Accountancy - Add Result page
2016-04-18 20:17:27 +02:00
Juanjo Menent
b236612975 Merge pull request #5038 from frederic34/patch-10
Update 3.9.0-4.0.0.sql
2016-04-18 20:15:17 +02:00
Juanjo Menent
48407da37b Merge pull request #5039 from frederic34/patch-11
Update rappro.php
2016-04-18 20:14:44 +02:00
Juanjo Menent
c743cdafed Merge pull request #5019 from AppChecker/develop
FIX: comparing instead of assign
2016-04-18 20:07:32 +02:00
nka11
39948968eb Merge branch 'develop' of ssh://github.com/Dolibarr/dolibarr into api_dev 2016-04-18 19:13:06 +02:00
nka11
4eb1aa59aa fix coding rules 2016-04-18 19:11:28 +02:00
Frédéric FRANCE
18b3b3a31d Update rappro.php 2016-04-18 08:14:02 +02:00
Frédéric FRANCE
c6226e63b7 Update 3.9.0-4.0.0.sql 2016-04-18 08:13:01 +02:00
Frédéric FRANCE
3db34a723d Update style.css.php 2016-04-18 00:55:12 +02:00
frederic34
60ebc6fa11 Some correction for testconnect 2016-04-18 00:47:08 +02:00
Frédéric FRANCE
09528cccaf Update printsheet.php 2016-04-17 19:14:48 +02:00
aspangaro
19b594ee9d Correct travis 2016-04-17 15:58:32 +02:00
aspangaro
b59c94e056 NEW: Accountancy - Add Result page
& review
2016-04-17 15:44:04 +02:00
Marcos García de La Fuente
257d9b2f8d NEW #4772 Removed support for Mysql deprecated driver. Please use Mysqli instead 2016-04-17 15:39:46 +02:00
Marcos García de La Fuente
e2c86d3fd8 NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead 2016-04-17 15:24:22 +02:00
Marcos García de La Fuente
54dd1763fe Little refactor 2016-04-17 15:05:54 +02:00
Frédéric FRANCE
d5980a5bf8 Update html.formmail.class.php 2016-04-17 12:20:45 +02:00
frederic34
75127638a4 Embed images 2016-04-17 10:28:21 +02:00
frederic34
8428b791f8 Add logger to dump smtp dialog 2016-04-16 22:25:47 +02:00
Marcos García de La Fuente
21ba24a0cd NEW Deprecated Societe::set_prospect_level, Societe::set_commnucation_level, Societe::set_OutstandingBill functions 2016-04-16 22:13:55 +02:00
Marcos García de La Fuente
84b58d27e6 NEW Renamed ActionComm::add function to ActionComm::create 2016-04-16 21:41:06 +02:00
Marcos García de La Fuente
863efcbc5d NEW Removed unused FormOrder::selectSourcesCommande function
Also refactored select functions to avoid using HTML and encourage using Form::selectarray function
2016-04-16 21:33:23 +02:00
Marcos García de La Fuente
3722fc1014 Refactored FormVentilation class 2016-04-16 20:16:38 +02:00
Marcos García de La Fuente
aa64266c2f FIX #5008 SQL error when editing the reference of a supplier invoice that already exists
Close #5008
2016-04-16 18:44:31 +02:00
frederic34
567dc1734e Add Swift Mailer to send mails 2016-04-16 18:15:03 +02:00
appchecker
bc949cafd2 fix: comparing instead of assign 2016-04-16 13:39:55 +03:00
Juanjo Menent
7163ee55f7 Merge pull request #5017 from simnandez/develop
FIX Travis fails
2016-04-16 09:34:46 +02:00
Juanjo Menent
a2b680aa5a Merge remote-tracking branch 'upstream/develop' into develop 2016-04-15 18:08:12 +02:00
Juanjo Menent
b7d36da74f Merge pull request #5006 from atm-maxime/new_banklink_withdraw
New add link to widthdraw slip card on bank transaction
2016-04-15 18:07:33 +02:00
Juanjo Menent
0ad971556b Merge pull request #5018 from simnandez/3.9
FIX #4961
2016-04-15 17:33:48 +02:00
Juanjo Menent
ecbf5996c1 FIX #4961 2016-04-15 17:20:37 +02:00
Juanjo Menent
f86952dfaa FIX Add missing field fk_shipping_method_id 2016-04-15 16:57:11 +02:00
Juanjo Menent
88ff138cd5 Merge pull request #5016 from simnandez/3.7
FIX #3815 With higher quality
2016-04-15 16:07:22 +02:00
Juanjo Menent
b5f7f962cc FIX Travis fails 2016-04-15 16:05:47 +02:00
Juanjo Menent
77263bb507 Merge pull request #5015 from simnandez/3.8
FIX #3815 With higher quality
2016-04-15 15:57:26 +02:00
Juanjo Menent
9f4ccfab95 FIX #3815 With higher quality 2016-04-15 15:54:51 +02:00
Juanjo Menent
6ba68ee742 Merge remote-tracking branch 'upstream/3.8' into 3.8 2016-04-15 15:43:51 +02:00
Juanjo Menent
c5ecc46a22 FIX #3815 With higher quality 2016-04-15 15:42:58 +02:00
Juanjo Menent
bff1ec2d80 Merge remote-tracking branch 'upstream/3.9' into develop 2016-04-15 13:49:59 +02:00
Juanjo Menent
44746c1899 Merge remote-tracking branch 'upstream/3.8' into 3.9
Conflicts:
	htdocs/compta/localtax/quadri_detail.php
2016-04-15 13:46:20 +02:00
Juanjo Menent
2d645c74dc Merge remote-tracking branch 'upstream/3.9' into 3.9 2016-04-15 13:36:08 +02:00
Juanjo Menent
d52a93ce4d Merge remote-tracking branch 'upstream/3.8' into 3.9
Conflicts:
	htdocs/compta/localtax/quadri_detail.php
2016-04-15 13:33:21 +02:00
Juanjo Menent
0d7e3a3a5c Merge pull request #5012 from simnandez/3.8
FIX #3815 Call to undefined function local_by_date(). branch 3.8
2016-04-15 13:07:40 +02:00
Juanjo Menent
e33d9eb5b4 Merge pull request #5010 from simnandez/3.7
FIX #3815 Call to undefined function local_by_date(). branch 3.7
2016-04-15 13:07:29 +02:00
Juanjo Menent
8751f6cfa0 Merge pull request #4998 from FHenry/3.9
FIX Hook resprint  must be printed
2016-04-15 13:05:40 +02:00
Juanjo Menent
4446e6a36c FIX #3815 Call to undefined function local_by_date(). branch 3.8 2016-04-15 12:47:21 +02:00