Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
122,559 Commits 36 Branches 189 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

12820 Commits

Author SHA1 Message Date
Laurent Destailleur
ad039ff968 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/repair.php
 2019-12-21 14:03:45 +01:00
Laurent Destailleur
c0ef3b46ad Work on MRP module 2019-12-20 15:31:05 +01:00
Laurent Destailleur
2ad483413e Better place to force the default warehouse 2019-12-19 12:05:34 +01:00
Laurent Destailleur
d9a1e1b348 Fix several non dolibarr behaviour on input of salary payments 2019-12-19 10:01:11 +01:00
Laurent Destailleur
92facbc892 Merge pull request #12726 from atm-gauthier/10.0_fix_units_trad 
FIX : units traductions for selectUnits() function
 2019-12-18 12:21:33 +01:00
Alexandre SPANGARO
3fb72c349f Fix language traduction on import/export tools 2019-12-18 03:25:19 +01:00
Laurent Destailleur
7b1bf32cd9 Update products.lang 2019-12-17 12:19:32 +01:00
gauthier
a672673319 FIX : units traductions for selectUnits() function 2019-12-17 11:25:25 +01:00
Laurent Destailleur
5c8733a84b More complete message 2019-12-16 19:30:18 +01:00
Laurent Destailleur
65abe7532c Fix error message not reported when deleting record in ledger. 2019-12-16 19:05:32 +01:00
Laurent Destailleur
98cc2c2886 Add tooltip 2019-12-16 14:29:47 +01:00
Laurent Destailleur
fdf4d86d81 Debug code 2019-12-16 12:38:51 +01:00
Laurent Destailleur
65bf2fa285 Merge pull request #12689 from code-chicken/develop 
Fix: calculation of virtual stock
 2019-12-14 13:40:02 +01:00
Frédéric FRANCE
57055bad03 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-13 14:36:00 +01:00
VESSILLER
0396b348f7 NEW add weighted amount on project/opportunity 2019-12-10 09:32:37 +01:00
Laurent Destailleur
ae6d536d1d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
 2019-12-09 13:32:56 +01:00
Laurent Destailleur
94bab15528 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
 2019-12-09 13:27:30 +01:00
Laurent Destailleur
2b5866aca2 WIP Complete module MRP 2019-12-08 23:45:06 +01:00
andreubisquerra
acbd8efa7d NEW: Takepos supplements 2019-12-08 23:16:49 +01:00
Rüdiger Hahn
d41675b028 Fix translations 2019-12-08 18:15:13 +01:00
Laurent Destailleur
93d66d8213 Debug v11 2019-12-06 08:50:26 +01:00
Frédéric FRANCE
d9bfa62367 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-05 21:47:42 +01:00
Laurent Destailleur
cdb0453661 Help 2019-12-05 14:17:40 +01:00
Laurent Destailleur
e6b4d2f665 Debug sumup 2019-12-04 18:06:05 +01:00
Frédéric FRANCE
4c5c6b6ff1 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-03 17:56:43 +01:00
Florian Mortgat
4846885eea NEW 9.0: enable user to use the mysqldump '--quick' option 
(useful if the server has low RAM or large tables)
 2019-12-02 16:54:05 +01:00
Laurent Destailleur
c692650430 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-02 15:23:40 +01:00
Laurent Destailleur
66571df449 Fix remove a link that is private 2019-12-02 15:19:14 +01:00
Frédéric FRANCE
25ed2b930f Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-12-01 16:10:37 +01:00
Laurent Destailleur
a6408ce9b6 Typo 2019-12-01 13:05:22 +01:00
Laurent Destailleur
eb69538d17 Fix if we insert a product already the product to produce 2019-11-29 23:51:46 +01:00
Laurent Destailleur
d374ce99a1 Trans 2019-11-28 13:20:09 +01:00
Cédric
45bf3e4df9 Merge branch 'develop' into patch-3 2019-11-28 13:11:52 +01:00
Frédéric FRANCE
b2912e688b Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-27 22:54:05 +01:00
Laurent Destailleur
cb352407eb Add submit 2019-11-26 12:46:40 +01:00
Laurent Destailleur
4ef6c9cc13 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/langs/en_US/ticket.lang
 2019-11-26 11:54:42 +01:00
Laurent Destailleur
9d2a5e6c42 Trans 2019-11-26 09:08:32 +01:00
Frédéric FRANCE
4c4ae5b6e1 Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-26 08:10:40 +01:00
Alexandre SPANGARO
60f19d134c Fix Ticket - Align language type with datas for translation 2019-11-26 03:58:01 +01:00
Laurent Destailleur
a8c2aa094d More examples 2019-11-25 20:30:05 +01:00
Laurent Destailleur
61f414488a Fix translation 2019-11-24 18:34:07 +01:00
Cédric
950a32a433 Checkbox label delete child product FR 2019-11-23 18:11:20 +01:00
Cédric
b959e59554 Checkbox label delete child product EN 2019-11-23 18:09:17 +01:00
atm-greg
ce15af0980 manage packaging on supplier prices 2019-11-23 15:52:34 +01:00
Laurent Destailleur
32f590f274 Merge pull request #12485 from aspangaro/12.0_a2 
NEW Add shipment widget
 2019-11-22 14:39:56 +01:00
Laurent Destailleur
383f095063 Fix trans 2019-11-22 09:45:14 +01:00
Alexandre SPANGARO
2f064567ef NEW Add shipment widget 2019-11-21 07:50:44 +01:00
Frédéric FRANCE
d182eee4bf Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-19 23:26:00 +01:00
Laurent Destailleur
5d7a1f1265 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/langs/en_US/stocks.lang
 2019-11-19 19:02:14 +01:00
Frédéric FRANCE
2e5f539b2a Merge remote-tracking branch 'upstream/develop' into actioncomm_category 2019-11-18 17:45:52 +01:00