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

61623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
75bc3d17e6
Update admin_extrafields_view.tpl.php 2018-04-11 14:55:29 +02:00
gauthier
5621d1f8ea FIX #8478 !empty instead of count to avoid warning 2018-04-10 15:03:15 +02:00
Laurent Destailleur
2b135dc951 FIX #8488 2018-04-05 13:13:45 +02:00
Laurent Destailleur
39758625b7
Merge pull request #8471 from atm-ph/fix_6.0_error_creating_soc 
Fix error on creating company with external module in 'custom' folder…
 2018-03-29 13:48:36 +02:00
Laurent Destailleur
0e986b8f97
Update societe.class.php 2018-03-29 13:48:09 +02:00
atm-ph
a89983ef5c Fix error on creating company with external module in 'custom' folder with a file to generate accountancy code 2018-03-28 15:41:10 +02:00
Laurent Destailleur
1c581c6fff
Merge pull request #8443 from atm-florian/6.0 
fix user right on modRessource,  fix security check on fourn card
 2018-03-24 16:37:11 +01:00
florian HENRY
11446fb2f7 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0 2018-03-22 23:26:37 +01:00
florian HENRY
46d2b4d62d fix security check on fourn card 2018-03-22 23:25:54 +01:00
Laurent Destailleur
9f67bb0aa3 Start 6.0.7 2018-03-22 21:58:24 +01:00
Laurent Destailleur
5efb94b06f Prepare 5.0.6 2018-03-22 14:13:58 +01:00
Laurent Destailleur
ed2d9f179b Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/card.php
 2018-03-22 14:12:37 +01:00
florian HENRY
1feb22ea9c fix user right on modRessource 2018-03-21 22:24:11 +01:00
Laurent Destailleur
7d5c3a5c4f
Merge pull request #8426 from atm-ph/fix_5.0_files_lost_on_contract 
Fix documents are lost if we rename contrat ref
 2018-03-21 20:40:23 +01:00
atm-ph
2094c48b7f Fix missing folder with multientity 2018-03-21 12:14:04 +01:00
atm-ph
cad7bdc74b Fix documents are lost if we rename contrat ref 2018-03-21 11:54:25 +01:00
Laurent Destailleur
04199c2b4b Fix according to mail of Olivier Geffroy the 21th of march 2018-03-21 10:59:13 +01:00
Laurent Destailleur
f371f80de3
Merge pull request #8400 from atm-arnaud/6.0_fix_societe_banner_status 
FIX show status on societe banner
 2018-03-18 12:46:19 +01:00
arnaud
32ce42610a FIX show status on societe banner 2018-03-16 11:18:00 +01:00
Laurent Destailleur
f3be6045f9
Merge pull request #8385 from ATM-Nicolas/fix_project_delete_task 
FIX : Delete tasks on project delete will now trigger TASK_DELETE
 2018-03-15 00:39:18 +01:00
ATM-Nicolas
e801b5a431 FIX : Delete tasks on project delete will now trigger TASK_DELETE 2018-03-14 11:38:42 +01:00
Laurent Destailleur
6b2490f4e4
Merge pull request #8375 from atm-quentin/6.0 
FIX reverse field to have object loaded in doaction
 2018-03-13 17:56:06 +01:00
atm-quentin
af09a3714b FIX reverse field to have object loaded in doaction 2018-03-13 17:12:03 +01:00
Laurent Destailleur
f82bedb36c
Merge pull request #8367 from atm-quentin/6.0 
FIX check shipping on delete order
 2018-03-13 09:53:57 +01:00
Laurent Destailleur
dcd3387a30
Update commande.class.php 2018-03-13 09:53:21 +01:00
Laurent Destailleur
51229a602f
Update commande.class.php 2018-03-13 09:51:45 +01:00
atm-quentin
6c7a5cebdf FIX check verif exped on delete order 2018-03-13 09:34:50 +01:00
Laurent Destailleur
d045dca003 Fix financial commitment 2018-03-12 20:04:25 +01:00
Laurent Destailleur
95e7062ca3 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-11 19:29:01 +01:00
Laurent Destailleur
d5d6939fd9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-03-11 19:28:39 +01:00
Laurent Destailleur
f98ca2e31a
Merge pull request #8335 from inoveaconseil/patch-1 
Fix #8092
 2018-03-11 00:06:28 +01:00
Laurent Destailleur
03f7df88c6
Update card.php 2018-03-11 00:05:32 +01:00
Laurent Destailleur
c755d5f58d
Merge pull request #8333 from atm-maxime/fix_advtargetemailin 
Fix #8057
 2018-03-10 23:54:34 +01:00
Inovea Conseil
c2397fad60
Fix #8092 2018-03-10 23:49:43 +01:00
Maxime Kohlhaas
c008853842 Fix #8057 2018-03-10 23:05:33 +01:00
Laurent Destailleur
faef7a2e0c
Merge pull request #8324 from atm-maxime/fix_unit_replen 
Fix unit in replenish #7225
 2018-03-10 12:58:16 +01:00
Maxime Kohlhaas
fd36ade61a Fix unit in replenish #7225 2018-03-10 11:20:32 +01:00
Laurent Destailleur
1d571c4159
Merge pull request #8315 from tuxgasy/5.0_invoice_supplier_multicurrency 
Fix bug when updating multi currency rate on invoice supplier
 2018-03-09 22:49:50 +01:00
TuxGasy
9eeb80151e Fix bug when updating multi currency rate on invoice supplier 2018-03-09 21:13:54 +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