David Avigni (Ankapi)
e298bd0a68
Fixed hook "pdf generation", executeHooks misnamed: replacement
...
"adterPDFCreation" with "afterPDFCreation"
2015-04-22 15:23:52 +02:00
Laurent Destailleur
12d841f27d
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-04-22 14:58:39 +02:00
Laurent Destailleur
3d609d5fd0
Sync transifex
2015-04-22 14:58:06 +02:00
Arnaud Aujon
97fc99517e
Fixes : contact webservice fix update using ref_ext
2015-04-22 12:47:45 +02:00
Arnaud Aujon
54ffaea000
Merge remote-tracking branch 'upstream/3.7' into 3.7-webservices-fix
2015-04-22 12:33:53 +02:00
Juanjo Menent
360b1c731d
Merge pull request #2692 from frederic34/patch-8
...
Update product.class.php
2015-04-22 11:22:29 +02:00
Frédéric FRANCE
768fdde2d1
Update product.class.php
2015-04-22 10:39:32 +02:00
Juanjo Menent
45c585ac64
Merge pull request #2691 from aspangaro/develop-devcamp
...
Fixed: For salaries in bank module : missing language file & simplify thidparty column (Informations are truncated by default)
2015-04-22 09:20:31 +02:00
aspangaro
b35c929cad
Merge remote-tracking branch 'Upstream/develop' into develop-Devcamp
2015-04-22 07:18:52 +02:00
aspangaro
560150fd1c
Fixed: For salaries in bank module : missing language file & simplify thidparty column (Informations are truncated by default)
2015-04-22 07:15:17 +02:00
Laurent Destailleur
f3ea694b97
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-04-22 00:17:24 +02:00
Laurent Destailleur
5b758e0e16
Fix migration process
2015-04-22 00:17:03 +02:00
Juanjo Menent
ad31f0110a
Improve PHPUnit Prices test for Spanish localtax1 and localtax2
2015-04-21 22:01:53 +02:00
Laurent Léonard
e0cc007487
Add sorting for extra fields values
2015-04-21 20:21:24 +02:00
Juanjo Menent
b9b21bce8a
Merge pull request #2679 from marcosgdf/bug-1786-2
...
FIX [ bug #1786 ] Spanish localtax2 calculation errors with corrective invoices
2015-04-21 18:52:56 +02:00
Laurent Destailleur
bce952fa9b
Fix bad link
2015-04-21 17:06:13 +02:00
Laurent Destailleur
f06255e9d2
Complete the mailmap file.
2015-04-21 16:57:45 +02:00
Laurent Destailleur
fab2c4a0c9
Merge pull request #2689 from GPCsolutions/mailmap
...
Added a mailmap for better git statistics
2015-04-21 16:08:51 +02:00
Laurent Destailleur
96a33bbe8a
First clean of code after devcamp
2015-04-21 15:49:58 +02:00
Raphaël Doursenaud
d5e40057e7
Added a mailmap for better git statistics
2015-04-21 14:29:53 +02:00
Laurent Destailleur
1c8e1638c7
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-04-21 12:08:56 +02:00
Laurent Destailleur
a690276060
Fix js warnings, select2 css was not loaded.
2015-04-21 12:08:36 +02:00
Laurent Destailleur
5a9c40eb59
Fix minor look and security errors
2015-04-21 12:03:51 +02:00
Laurent Destailleur
7a4d1d990e
Fix security hole
2015-04-21 11:41:21 +02:00
Laurent Destailleur
e476b57795
Merge pull request #2678 from defrance69/patch-60
...
add tab management on salarie payement
2015-04-21 11:15:20 +02:00
Laurent Destailleur
9d1c609c4f
Merge pull request #2538 from marcosgdf/units
...
NEW [ task 977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
2015-04-21 11:14:50 +02:00
Laurent Destailleur
616e28eecd
Merge pull request #2684 from aternatik/fix_odt_lines_type
...
Add missing value into ODT for object line type (product or service)
2015-04-21 11:13:02 +02:00
Laurent Destailleur
8555691c04
Merge pull request #2680 from marcosgdf/bug-1897-hook
...
[ bug #1897 ] PHP Fatal error when editing Margin module settings with USER_UPDATE_SESSION trigger turned on
2015-04-21 11:12:29 +02:00
Laurent Destailleur
819e463255
Merge pull request #2685 from frederic34/patch-8
...
test for mysql 5.6
2015-04-21 11:12:08 +02:00
Arnaud Aujon
afc4d89c64
Orders webservice : Generate pdf document on valid
2015-04-20 20:18:17 +02:00
Florian HENRY
99cc52fdfa
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-04-20 17:17:38 +02:00
Frédéric FRANCE
9f899c93ef
Update .travis.yml
2015-04-20 17:11:09 +02:00
jfefe
f2d05ce754
Add missing value for object line type (product or service)
2015-04-20 16:20:04 +02:00
Marcos García de La Fuente
ad5dd8e70f
[ bug #1897 ] PHP Fatal error when editing Margin module settings with USER_UPDATE_SESSION trigger turned on
2015-04-20 01:36:48 +02:00
Laurent Destailleur
94589b9935
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-04-19 23:15:39 +02:00
Laurent Destailleur
65dafeee55
Uniformize feature between invoice and merging tool
2015-04-19 23:15:24 +02:00
Marcos García de La Fuente
28b89a2dec
Fix [ bug #1786 ] Spanish localtax2 calculation errors with corrective invoices
2015-04-19 18:58:56 +02:00
Marcos García de La Fuente
2967bc7df7
Merge branch 'develop' into units
2015-04-19 17:19:59 +02:00
Marcos García de La Fuente
7be7a770c1
Implemented units for CommandeFournisseur and FactureFournisseur
2015-04-19 16:46:24 +02:00
Laurent Destailleur
560fcb1b24
Remove external module
2015-04-19 15:27:30 +02:00
Laurent Destailleur
ba706ec8e1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2015-04-19 13:34:09 +02:00
BENKE Charlie
51cb680f19
Create info.php
...
add info tabs
2015-04-19 13:32:59 +02:00
Laurent Destailleur
d4924b40cf
Merge pull request #2677 from GPCsolutions/minified-select2
...
Use minified select2 js lib
2015-04-19 13:32:36 +02:00
Laurent Destailleur
89412082ab
Change to debug mysql
2015-04-19 13:31:20 +02:00
BENKE Charlie
a151defc4b
Add tabs management
2015-04-19 13:28:51 +02:00
BENKE Charlie
5a68cba013
Create salaries.lib.php
...
add lib salaries for menu management
2015-04-19 13:25:43 +02:00
Laurent Destailleur
38dc5b2555
Change to debug travis
2015-04-19 13:21:33 +02:00
Florian HENRY
72c92557de
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
htdocs/product/class/propalmergepdfproduct.class.php
2015-04-19 13:06:59 +02:00
Florian HENRY
37bc7c3f1d
typo
2015-04-19 13:05:40 +02:00
Raphaël Doursenaud
e7a21de11d
Use minified select2 js lib
2015-04-19 12:58:47 +02:00
