Laurent Destailleur
|
67208b111d
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/compta/facture.php
htdocs/expedition/card.php
htdocs/product/list.php
|
2017-10-26 17:02:40 +02:00 |
|
Laurent Destailleur
|
c48721e008
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-10-26 16:50:53 +02:00 |
|
Laurent Destailleur
|
0efd118d43
|
Fix hook on product list
|
2017-10-26 16:50:38 +02:00 |
|
Laurent Destailleur
|
58584d8784
|
Update fournisseur.commande.class.php
|
2017-10-24 13:05:12 +02:00 |
|
dolibarr95
|
76aa2df807
|
Try to fix #7692
`$this->fk_soc` is empty replace by `$this->socid`
|
2017-10-24 13:05:05 +02:00 |
|
Laurent Destailleur
|
da93081f47
|
Merge pull request #7688 from atm-florian/6.0
fix accountancy index display
|
2017-10-24 12:41:39 +02:00 |
|
Laurent Destailleur
|
ba434617dc
|
FIX Missing function getLinesArray
|
2017-10-23 14:44:06 +02:00 |
|
Laurent Destailleur
|
97b694b59c
|
Fix missing field in migration v6
|
2017-10-23 10:22:45 +02:00 |
|
florian HENRY
|
c258e229c8
|
fix accountancy index display
|
2017-10-23 10:00:22 +02:00 |
|
Laurent Destailleur
|
611f5f638d
|
FIX #7616
|
2017-10-22 15:07:41 +02:00 |
|
Laurent Destailleur
|
79279caa2e
|
FIX #7619
|
2017-10-22 14:56:00 +02:00 |
|
Laurent Destailleur
|
745c4625a6
|
FIX #7619
|
2017-10-22 14:48:42 +02:00 |
|
Laurent Destailleur
|
be0cd601a9
|
Fix dead code
|
2017-10-22 14:07:54 +02:00 |
|
Laurent Destailleur
|
703d4a6aee
|
FIX #7648
|
2017-10-22 14:02:24 +02:00 |
|
Laurent Destailleur
|
6b0d060289
|
Merge pull request #7677 from frederic34/stockinvoice
stock on supplier invoice back to draft
|
2017-10-22 03:33:11 +02:00 |
|
Laurent Destailleur
|
4325363084
|
Merge pull request #7676 from frederic34/patch-2
FIX #7675
|
2017-10-22 03:25:22 +02:00 |
|
Laurent Destailleur
|
fba3adbc5e
|
Merge pull request #7670 from atm-ph/fix_5_0_empty_ref_shipment
Fix shipment ref is empty
|
2017-10-22 03:00:26 +02:00 |
|
Laurent Destailleur
|
030cea6a0f
|
Merge pull request #7664 from frederic34/patch-1
keep vat input with multiprices product creation
|
2017-10-22 02:42:44 +02:00 |
|
Laurent Destailleur
|
b70808eca7
|
Merge pull request #7663 from tuxgasy/5.0_anchor_addline
Fix anchor after add line
|
2017-10-22 02:35:13 +02:00 |
|
Laurent Destailleur
|
16c212c9fd
|
Merge pull request #7662 from atm-florian/6.0
fix displaying accountancy code
|
2017-10-22 02:32:01 +02:00 |
|
Laurent Destailleur
|
1afbf75cbc
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
htdocs/index.php
|
2017-10-22 01:30:25 +02:00 |
|
Laurent Destailleur
|
da8fe06301
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-10-22 01:26:17 +02:00 |
|
Laurent Destailleur
|
cad44ee68a
|
FIX substitution in ODT of thirdparties documents
|
2017-10-22 01:25:59 +02:00 |
|
Frédéric FRANCE
|
8baad70f6c
|
stock on supplier invoice back to draft
|
2017-10-21 20:26:32 +02:00 |
|
Frédéric FRANCE
|
735f06fd83
|
FIX #7675
|
2017-10-21 16:20:06 +02:00 |
|
atm-ph
|
08d5ff4736
|
Fix shipment ref is empty
|
2017-10-20 12:28:33 +02:00 |
|
Laurent Destailleur
|
a1217d61b6
|
Merge pull request #7654 from simnandez/6.0
FIX: Bad localtax apply
|
2017-10-19 19:28:02 +02:00 |
|
Laurent Destailleur
|
fbc3be84e3
|
Merge pull request #7643 from atm-maxime/fix_dashboard_stats_links
Fix dashboard stats links
|
2017-10-19 19:26:49 +02:00 |
|
Laurent Destailleur
|
efaa0b1e2a
|
Merge pull request #7640 from atm-florian/6.0_fixeventiconstatus
fix : better icon for event status Non applicable
|
2017-10-19 19:18:56 +02:00 |
|
Laurent Destailleur
|
f7556e7ad2
|
FIX make of link to other object during creation
|
2017-10-19 19:06:48 +02:00 |
|
Frédéric FRANCE
|
5afd2695fb
|
keep vat input with multiprices product creation
|
2017-10-19 18:33:15 +02:00 |
|
Laurent Destailleur
|
d4ade7b935
|
FIX API to get object does not return data o flinked objects
|
2017-10-19 17:57:16 +02:00 |
|
Laurent Destailleur
|
d7113a3602
|
Fix init of environment for a dedicated entity in API
|
2017-10-19 17:32:23 +02:00 |
|
Laurent Destailleur
|
8da7f789d8
|
Fix init of environment for a dedicated entity in API
|
2017-10-19 17:30:08 +02:00 |
|
TuxGasy
|
9c3805c0d5
|
Fix anchor after add line
|
2017-10-19 14:10:58 +02:00 |
|
Laurent Destailleur
|
83440f5bbc
|
FIX #7626
|
2017-10-19 13:07:33 +02:00 |
|
florian HENRY
|
b0c68ddc61
|
fix displaying accountancy code
|
2017-10-19 12:35:59 +02:00 |
|
Laurent Destailleur
|
cb089987ee
|
Fix code comment
|
2017-10-19 12:35:15 +02:00 |
|
Laurent Destailleur
|
93d16bf4d7
|
Fix several fixes in APIs
|
2017-10-19 12:30:36 +02:00 |
|
Laurent Destailleur
|
7ee64fc0d4
|
Fix css
|
2017-10-18 19:39:22 +02:00 |
|
Laurent Destailleur
|
3e43e164ae
|
FIX Bad ressource list in popup in gantt view
|
2017-10-18 19:13:44 +02:00 |
|
Laurent Destailleur
|
74b401b70d
|
Fix bad perm to delete file
|
2017-10-18 17:40:47 +02:00 |
|
Laurent Destailleur
|
8626d6279a
|
Fix perm to delete files
|
2017-10-18 17:21:30 +02:00 |
|
Juanjo Menent
|
df53870c01
|
FIX: Bad localtax apply
|
2017-10-18 12:13:32 +02:00 |
|
Juanjo Menent
|
4382642099
|
FIX: Bad localtax apply
|
2017-10-18 12:10:00 +02:00 |
|
Laurent Destailleur
|
b124c7f16d
|
Clean params
|
2017-10-18 11:15:54 +02:00 |
|
Laurent Destailleur
|
000c1bddb2
|
Fix we lose the private not when closing proposal
|
2017-10-18 11:12:59 +02:00 |
|
florian HENRY
|
50cacfee3d
|
lighter icon
|
2017-10-17 13:24:38 +02:00 |
|
Laurent Destailleur
|
aa1ff189e1
|
Fix var not correctly initialized when using api + multicompany
|
2017-10-17 12:58:26 +02:00 |
|
Laurent Destailleur
|
235817c581
|
Fix missing default limit
|
2017-10-17 12:02:58 +02:00 |
|