jean
|
1f31ff338c
|
correction for fetch sql
|
2015-02-11 14:39:32 +01:00 |
|
Florian HENRY
|
2ad2013e92
|
Merge branch '3.7_bug1840' into 3.7
|
2015-02-11 11:51:48 +01:00 |
|
Florian HENRY
|
e9bfa71556
|
syntax
|
2015-02-11 11:49:06 +01:00 |
|
Florian HENRY
|
db2dee7c03
|
syntax
|
2015-02-11 11:48:11 +01:00 |
|
Florian HENRY
|
db94860f76
|
syntax
|
2015-02-11 11:47:12 +01:00 |
|
Florian HENRY
|
73f1d10b72
|
syntax
|
2015-02-11 11:46:29 +01:00 |
|
Florian HENRY
|
7f5e4aa135
|
FIX : bug #1840 Email template modules in HTML are not render correctly
|
2015-02-11 11:44:49 +01:00 |
|
Florian HENRY
|
8af845f27d
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-02-11 11:41:50 +01:00 |
|
Laurent Destailleur
|
ddb95e5765
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
htdocs/comm/mailing/fiche.php
htdocs/compta/paiement/liste.php
htdocs/contact/class/contact.class.php
htdocs/core/lib/tax.lib.php
htdocs/core/modules/expedition/doc/pdf_merou.modules.php
htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
htdocs/langs/en_US/agenda.lang
htdocs/webservices/server_contact.php
|
2015-02-10 21:33:43 +01:00 |
|
Laurent Destailleur
|
039a184d70
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
|
2015-02-10 21:13:12 +01:00 |
|
Laurent Destailleur
|
abcf4480de
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-02-10 21:02:23 +01:00 |
|
Laurent Destailleur
|
fce7a0e36e
|
Bad translation
|
2015-02-10 21:01:44 +01:00 |
|
Raphaël Doursenaud
|
7dea799a9e
|
FIXED Allowed 0 to be used as an account mask
0 is used by some accounting systems and software.
|
2015-02-10 17:18:32 +01:00 |
|
jean
|
2820bd24ac
|
fetch must contain an left join on c_actioncom for correct function
|
2015-02-10 16:03:31 +01:00 |
|
Marcos García de La Fuente
|
e485dd413d
|
PHPDoc and misc fixes for several folders
|
2015-02-10 13:41:59 +01:00 |
|
Marcos García de La Fuente
|
530186c59d
|
PHPDoc and misc fixes for several folders
|
2015-02-10 13:32:00 +01:00 |
|
Arnaud Aujon Chevallier
|
863c1f7a13
|
fix typo in createOrder
|
2015-02-10 13:21:36 +01:00 |
|
Marcos García de La Fuente
|
0d6d98b395
|
PHPDoc and misc fixes for several folders
|
2015-02-10 13:17:37 +01:00 |
|
Florian HENRY
|
cc87a6fe12
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-02-10 11:55:31 +01:00 |
|
Marcos García de La Fuente
|
023175b9f1
|
PHPDoc and misc fixes for several folders
|
2015-02-10 11:38:13 +01:00 |
|
Marcos García de La Fuente
|
ca939bf8a5
|
PHPDoc and misc fixes for several folders
|
2015-02-10 11:02:11 +01:00 |
|
Marcos García de La Fuente
|
e21681a369
|
PHPDoc and misc fixes for Admin
|
2015-02-10 10:52:48 +01:00 |
|
Marcos García de La Fuente
|
157a6e109e
|
Misc Adherents PHPDoc corrections
|
2015-02-10 10:45:48 +01:00 |
|
Marcos García de La Fuente
|
0d150b1d32
|
Removed unused code, misc corrections and corrected PHPDoc problems.
|
2015-02-10 10:25:59 +01:00 |
|
Marcos García de La Fuente
|
6531a5c6c7
|
Fix: [ bug #1830 ] Salaries payment only allows checking accounts
|
2015-02-10 09:44:27 +01:00 |
|
aspangaro
|
f1d5e1ba7b
|
FIXED Correct typo on Changelog
|
2015-02-10 07:14:55 +01:00 |
|
Marcos García de La Fuente
|
a9dc6bb3d7
|
Fix: [ bug #1826 ] Supplier payment types are not translated in fourn/facture/paiement.php
|
2015-02-10 00:55:22 +01:00 |
|
Marcos García de La Fuente
|
58a61e1294
|
Changed int typecast to float
|
2015-02-10 00:23:32 +01:00 |
|
Marcos García de La Fuente
|
949f9e40a0
|
Fix: [ bug #1832 ] SQL error when adding a product with no price defined to an object
|
2015-02-10 00:20:47 +01:00 |
|
KreizIT
|
2483d96b33
|
FIXED: #1829 POS not compatible with batch products
|
2015-02-09 17:19:20 +01:00 |
|
Arnaud Aujon Chevallier
|
5747dbfe9b
|
FIXED : product webservice can now save barcode
|
2015-02-09 13:55:43 +01:00 |
|
Marcos García de La Fuente
|
d9ac21ab82
|
Fix: [ bug #1822 ] SQL error in clientfourn.php report with PostgreSQL
|
2015-02-08 16:54:41 +01:00 |
|
Maxime Kohlhaas
|
db9d727eb8
|
FIX : Link to user was wrong on bank transaction card
|
2015-02-08 12:36:55 +01:00 |
|
Laurent Destailleur
|
24ad1afdd2
|
Merge pull request #2335 from atm-alexis/3.7
FIX empty discount where created if amount is null
|
2015-02-08 00:07:48 +01:00 |
|
Laurent Destailleur
|
2c730bf61c
|
Merge pull request #2332 from aspangaro/3.7-patch1
FIXED Review
|
2015-02-08 00:03:11 +01:00 |
|
Laurent Destailleur
|
07877bc381
|
Merge branch 'marcosgdf-bug-1827' into 3.6
|
2015-02-07 23:57:13 +01:00 |
|
Laurent Destailleur
|
e8b2b22c32
|
Merge branch 'bug-1827' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1827
Conflicts:
ChangeLog
|
2015-02-07 23:56:38 +01:00 |
|
Laurent Destailleur
|
cdc3af7bbe
|
Merge pull request #2327 from aspangaro/3.7
FIXED : Lost field in migration for accountancy
|
2015-02-07 23:49:47 +01:00 |
|
Laurent Destailleur
|
d10e28db36
|
Merge pull request #2326 from aaujon/3.6-webservice-order
FIXES Webservice : fk_delivery_address not saved
|
2015-02-07 23:49:31 +01:00 |
|
Laurent Destailleur
|
6eb0d34032
|
Merge pull request #2325 from aaujon/3.6-webservices-contact
FIXED #1824 Add ref_ext for Contact webservices
|
2015-02-07 23:47:19 +01:00 |
|
Alexis Algoud
|
0ca6661e69
|
FIX empty discount where created if amount is null for a line with a different tva
|
2015-02-07 23:42:35 +01:00 |
|
Laurent Destailleur
|
1314d9ce4e
|
Merge pull request #2311 from marcosgdf/bug-1810
Fix: [ bug #1810 ] [pgsql] Error while upgrading from 3.6 to 3.7
|
2015-02-07 23:41:48 +01:00 |
|
Laurent Destailleur
|
e42290cb88
|
Update doc
|
2015-02-07 19:35:00 +01:00 |
|
Laurent Destailleur
|
1d1b3da182
|
Fix: the syslog handler for chromphp an fiefoxphp was not visible when
they should not.
|
2015-02-07 19:30:28 +01:00 |
|
Laurent Destailleur
|
64963ef9bd
|
Fix: the syslog handler for chromphp an fiefoxphp was not visible when
they should not.
|
2015-02-07 19:12:22 +01:00 |
|
Laurent Destailleur
|
90fdc29d5e
|
Fix restore compatibility
|
2015-02-07 17:41:20 +01:00 |
|
aspangaro
|
63dd237b85
|
Typo
|
2015-02-07 15:21:30 +01:00 |
|
aspangaro
|
f23212eb22
|
Center title column & modify language key
|
2015-02-07 14:55:56 +01:00 |
|
aspangaro
|
ace524056e
|
Same problem
|
2015-02-07 14:34:04 +01:00 |
|
aspangaro
|
ba78b4c5e9
|
FIXED Missing language file
|
2015-02-07 14:18:02 +01:00 |
|