Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
72,480 Commits 36 Branches 189 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

8581 Commits

Author SHA1 Message Date
Laurent Destailleur
f06911a8b0 Merge remote-tracking branch 'origin/3.8' into 3.9 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	htdocs/societe/commerciaux.php
 2016-03-04 15:39:55 +01:00
Laurent Destailleur
cb7ae31c65 Merge pull request #4722 from grandoc/develop 
fix : missing translation
 2016-03-04 15:31:42 +01:00
philippe grand
6851c3fdb0 fix : missing translation 2016-03-03 16:18:07 +01:00
philippe grand
4a3509d350 fix : missing translation 2016-03-03 16:09:19 +01:00
philippe grand
74601a0b1d fix : missing translation 2016-03-03 16:01:50 +01:00
philippe grand
9e80a37947 fix : missing translation 2016-03-03 15:45:42 +01:00
Laurent Destailleur
40144eee8d NEW linked object can show now the recurring invoices with other linked 
objects.
 2016-03-03 13:38:16 +01:00
Laurent Destailleur
3cbeca26e7 NEW When creating a template invoice from a draft invoice, if there is 
link to contract on draft invoice, link is kept on template invoice.
 2016-03-03 13:16:46 +01:00
philippe grand
ba2c0db159 fix : missing translation 2016-03-03 12:00:08 +01:00
philippe grand
9f798bc3fc fix : missing translation 2016-03-03 11:54:12 +01:00
Laurent Destailleur
fd2166ed11 Minor enhancement on new recurring invoice generation 2016-03-03 10:42:49 +01:00
Laurent Destailleur
3a58613e45 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyyear.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php
	htdocs/fourn/facture/list.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
	htdocs/projet/activity/index.php
 2016-03-02 23:40:11 +01:00
philippe grand
59c4559a78 fix : missing translation 2016-03-02 21:13:12 +01:00
Laurent Destailleur
2ee74a80d9 NEW Enhance navigation of project module 2016-02-28 00:01:50 +01:00
Laurent Destailleur
fe83a6595a Remove duplicate translation keys 2016-02-27 16:17:49 +01:00
Juanjo Menent
c2c6d77caa FIX : Improve and add missing translations 
As is not the branch develop, instead of transifex, we use GIT
 2016-02-26 22:43:25 +01:00
Juanjo Menent
b34459c949 FIX : Improve and add missing translations 
As is not the branch develop, instead of transifex, we use GIT
 2016-02-26 22:31:36 +01:00
Juanjo Menent
7691e8c018 FIX : Improve and add missing translations 
As is not the branch develop, instead of transifex, we use GIT
 2016-02-26 22:17:22 +01:00
Laurent Destailleur
0d6546e18e NEW Add an explanation message on shipment page to explain you can't 
make shipment if order is not validated
 2016-02-25 18:18:33 +01:00
Laurent Destailleur
a95240e33d FIX Some troubles into weight and volume calculation when unit differs. 
NEW Introduce a function showDimensionInBestUnit
 2016-02-25 13:46:38 +01:00
Laurent Destailleur
b0f816a400 NEW Add weight/volume for one product into shipment export 2016-02-25 02:22:40 +01:00
Laurent Destailleur
4b89b0b7aa Fix bad status translation for shipment 2016-02-24 22:13:29 +01:00
Laurent Destailleur
6ee4637f35 Fix bad status translation for shipment 2016-02-24 22:12:38 +01:00
Laurent Destailleur
02c0f52880 NEW Include sales representative into export of thirdparties 2016-02-24 16:56:24 +01:00
Laurent Destailleur
371dec8503 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
	htdocs/langs/en_US/products.lang
	htdocs/langs/fr_FR/companies.lang
 2016-02-24 12:13:12 +01:00
Laurent Destailleur
5d1241be2f Sync transifex 2016-02-24 12:10:25 +01:00
Laurent Destailleur
449d44419d Fix: When module shipment is on, a contact of order is also contact of 
shipment
 2016-02-24 11:17:47 +01:00
Laurent Destailleur
843dada35d Fix translation export/import 2016-02-22 17:42:41 +01:00
Laurent Destailleur
81116da33b Add a control of file format 2016-02-22 15:10:33 +01:00
Laurent Destailleur
cfdaa0e13c Fix missing translation 
Fix import of state
 2016-02-22 14:49:30 +01:00
Laurent Destailleur
3c2b50c6a2 Include PR 2016-02-21 19:14:18 +01:00
Laurent Destailleur
d3960b0809 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/member.lib.php
	htdocs/expedition/card.php
 2016-02-20 04:25:39 +01:00
Laurent Destailleur
7def330f54 Fix missing error message and input lost in shipment create page 2016-02-20 03:58:52 +01:00
Laurent Destailleur
0ec6c20ebb Translation 2016-02-20 02:55:32 +01:00
Laurent Destailleur
f762196c77 NEW Can define number of first and last line into import wizard. 2016-02-20 02:21:24 +01:00
Laurent Destailleur
4754ba5683 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/install/mysql/data/llx_10_c_regions.sql
	htdocs/install/mysql/data/llx_20_c_departements.sql
	htdocs/install/mysql/data/llx_c_forme_juridique.sql
	htdocs/langs/de_DE/companies.lang
	htdocs/langs/fr_FR/bills.lang
	htdocs/langs/fr_FR/companies.lang
	htdocs/langs/fr_FR/compta.lang
 2016-02-19 20:17:51 +01:00
Laurent Destailleur
0faebc25ba Update translations 2016-02-19 19:33:31 +01:00
Laurent Destailleur
da284cda8c Add category Supplier Relationship Manager 2016-02-19 19:20:21 +01:00
Laurent Destailleur
9c8d69eaa9 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/core/menus/init_menu_auguria.sql
	htdocs/core/menus/standard/eldy.lib.php
 2016-02-19 04:46:11 +01:00
Laurent Destailleur
16c44af690 Fix bad example of setup to use 2016-02-19 02:44:56 +01:00
Laurent Destailleur
b0b2668428 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-02-18 23:21:22 +01:00
Laurent Destailleur
bc4c964b89 Several fixes in stock management (label, and bad action when lot module 
is on)
 2016-02-18 23:21:02 +01:00
BENKE Charlie
7939169ae8 Change projets title Area 2016-02-18 11:54:48 +01:00
Laurent Destailleur
633de3bcb4 Fix list of object referers should not be set to invoice by default (may 
be module is disabed). I replace with a message to choose list.
 2016-02-17 22:33:02 +01:00
Laurent Destailleur
e0a0817123 Merge pull request #4623 from IonAgorria/dynamic-price-changes 
Dynamic price corretions/changes
 2016-02-16 15:11:02 +01:00
Laurent Destailleur
9d418bca7f Merge branch 'new_add_customer_multicurrency_payment' of 
https://github.com/atm-ph/dolibarr into
atm-ph-new_add_customer_multicurrency_payment

Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-16 15:06:39 +01:00
Laurent Destailleur
fad09357f4 NEW Show total number of modules into the module list 2016-02-16 12:54:42 +01:00
Laurent Destailleur
36b0cb5b23 NEW Merge all admin tools (system and module admin tools) into same 
entry "Admin tools", so now things are clear: All features restricted to
an admin user is inside "setup" (for setup) or "admin tools" (for action
tools) instead of 3 different entries.
 2016-02-16 12:50:15 +01:00
Laurent Destailleur
c78997ed23 Tons of fixes and enhancement on recurring invoice generation 2016-02-16 00:31:05 +01:00
phf
86c8998742 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_add_customer_multicurrency_payment 
Conflicts:
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 20:53:06 +01:00