lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
61,586 Commits 43 Branches 150 Tags 886 MiB
c755d5f58d
Commit Graph

61586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
c755d5f58d
Merge pull request #8333 from atm-maxime/fix_advtargetemailin 
Fix #8057
 2018-03-10 23:54:34 +01:00
Maxime Kohlhaas
c008853842 Fix #8057 2018-03-10 23:05:33 +01:00
Laurent Destailleur
6d0c4deb6e
Merge pull request #8295 from ATM-Marc/FIX_product_photo_ecm 
FIX: warning when adding ECM files using old photo path
 2018-03-08 16:24:42 +01:00
Marc de Lima Lucio
884b74a6bb FIX: warning when adding ECM files using old photo path 2018-03-07 17:12:59 +01:00
Laurent Destailleur
8b9041b93e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-07 13:02:18 +01:00
Laurent Destailleur
4caefbe926 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-03-07 12:59:52 +01:00
Laurent Destailleur
94de6efa4b
Merge pull request #8291 from ATM-Marc/FIX_order_export_date_livraison 
FIX: add planned delivery to order exports
 2018-03-07 12:59:32 +01:00
Laurent Destailleur
3284ebdcf1
Merge pull request #8290 from atm-alexis/6.0_fix_natural_search_double_space 
FIX natural search double quote
 2018-03-07 12:56:37 +01:00
Marc de Lima Lucio
dd208348c4 FIX: add planned delivery to order exports 2018-03-07 12:18:08 +01:00
alexis Algoud
cb27eb98e1 FIX natural search double quote 2018-03-07 11:42:47 +01:00
Laurent Destailleur
f9f37c52de
Merge pull request #8275 from ATM-Nicolas/fix_order_line_fk_multicurrency 
Fix order line fk multicurrency
 2018-03-05 20:50:14 +01:00
ATM-Nicolas
60f8ca1283 Merge branch '6.0' of github.com:Dolibarr/dolibarr into fix_order_line_fk_multicurrency 2018-03-05 09:03:20 +01:00
Laurent Destailleur
57d6417095
Merge pull request #8264 from atm-alexis/FIX_migrate_script_product_photo 
FIX migration script for product photo
 2018-03-02 18:12:18 +01:00
Laurent Destailleur
6bb91dd5d2 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-02 17:54:42 +01:00
Laurent Destailleur
aab0a33f40
Merge pull request #8251 from atm-gauthier/5.0_fix_last_situation 
FIX : if we make a mistake with situation_percent, now we can correct…
 2018-03-02 17:54:20 +01:00
alexis Algoud
ce2fc28d80 FIX migration script for product photo 2018-03-02 16:12:58 +01:00
Laurent Destailleur
ee4fcba4f2 Fix class not found 2018-02-27 22:11:11 +01:00
gauthier
4d05bff780 FIX : if we make a mistake with situation_percent, now we can correct it. before situation_final was always set to 1 and no way to go back 2018-02-27 12:27:25 +01:00
ATM-Nicolas
27100df927 FIX : Avoid empty value to fk_multicurrency attribute 2018-02-27 11:06:11 +01:00
Laurent Destailleur
64dd6439e7
Merge pull request #8223 from atm-florian/6.0 
fix bad link invoice URL into acoutantcy customer affectation
 2018-02-25 12:42:03 +01:00
Laurent Destailleur
286d62edb8
Merge pull request #8221 from ATM-Marc/FIX_usercard_columns 
FIX: solve column mismatch in user card with multicompany transverse mode + code cleanup
 2018-02-25 12:35:05 +01:00
Laurent Destailleur
c698558d9e
Merge pull request #8212 from simnandez/6.0 
Fix: Not showing link to ad event if module is disabled
 2018-02-25 12:28:06 +01:00
Laurent Destailleur
b20ae45265
Merge pull request #8210 from atm-john/fix_sql_entity 
Fix sql entity for sub query
 2018-02-25 12:27:35 +01:00
Laurent Destailleur
2d252e85e6 FIX Import process must stop after ending line nb to import 2018-02-25 12:15:36 +01:00
florian HENRY
b4b185abe0 fix bad link invoice URL into acoutantcy customer affectation 2018-02-23 14:42:52 +01:00
Marc de Lima Lucio
36cc1c6ca9 FIX: solve column mismatch in user card's usergroup list + code cleanup 2018-02-23 11:59:22 +01:00
Juanjo Menent
1d6baf5f2b Fix: Not showing link to ad event if module is disabled 2018-02-22 10:16:53 +01:00
John
b276a8186e Fix sql entity for sub query 2018-02-21 10:03:04 +01:00
Laurent Destailleur
7f419a29e7
Merge pull request #8072 from laudeco/hotfix/8028_replacement_bill 
fix the bill replacement with discounts #8028
 2018-02-20 15:19:19 +01:00
Laurent Destailleur
01c2971f4f Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 15:08:17 +01:00
Laurent Destailleur
9690e68bfb
Merge pull request #8206 from fmarcet/5.0 
Fix: Barcode type on massive init
 2018-02-20 15:07:53 +01:00
Laurent Destailleur
b8736f5103 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 14:59:40 +01:00
Laurent Destailleur
a698ba0b56
Merge pull request #8205 from steschuser/5.0 
FIX: #8139 User search does not work if MAIN_USE_OLD_SEARCH_FORM, missing list.php
 2018-02-20 14:59:20 +01:00
Laurent Destailleur
85e5ac678f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 14:56:17 +01:00
Laurent Destailleur
6c8e7494f0
Merge pull request #8200 from atm-maxime/fix_contact_tooltiip 
Fix contact tooltip
 2018-02-20 14:56:06 +01:00
Laurent Destailleur
276f2dce77 FIX #8200 2018-02-20 14:55:23 +01:00
Laurent Destailleur
67ee443b34 Fix can set holiday remaining to 0 2018-02-20 14:53:19 +01:00
Laurent Destailleur
4056b87a74 Fix syntax error 2018-02-20 12:36:03 +01:00
Laurent Destailleur
7321829732 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-20 12:34:15 +01:00
Laurent Destailleur
ea071b7680 Fix can't delete holiday refused 2018-02-20 12:31:26 +01:00
Ferran Marcet
671b4a399d Fix: Barcode type 2018-02-19 17:47:24 +01:00
Ferran Marcet
2e1727e323 Fix: Barcode type 2018-02-19 17:45:19 +01:00
Ferran Marcet
5535daf84a Merge branch '5.0up' into 5.0 2018-02-19 17:43:14 +01:00
sschwebel
7c583227fb FIX: #8139 2018-02-19 10:58:05 +01:00
Laurent Destailleur
033b898106
Merge pull request #8202 from atm-john/6.0_fix_invoice_extrafield_transmition_to_credit 
fix invoice extrafield transmition to credit
 2018-02-15 17:31:23 +01:00
John
49bad95d31 fix method exist test 2018-02-15 17:04:27 +01:00
John
63987fa32e fix invoice extrafield transmition to credit 2018-02-15 16:39:47 +01:00
Maxime Kohlhaas
bfd46f62ea Fix : contact and user getnomurl needs all info to display tooltip correctly 2018-02-15 15:18:25 +01:00
Maxime Kohlhaas
6fe69d4a60 Wrong field in thirdparty getnomurl 2018-02-15 15:17:59 +01:00
Laurent Destailleur
15ab37b46e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-02-14 21:51:55 +01:00