Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 18:18:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
56,675 Commits 36 Branches 190 Tags
e05de2942b51de1c6a07d5df40352f4b45e13ba4
Commit Graph

2412 Commits

Author SHA1 Message Date
Laurent Destailleur
2668cb20cc Work on SEPA mandate 2016-10-01 20:45:50 +02:00
Laurent Destailleur
c9792ff047 Fix translation 2016-10-01 20:12:00 +02:00
Laurent Destailleur
5a1e96b598 FIX #5823 better multicompany support for member module 2016-10-01 18:55:37 +02:00
Laurent Destailleur
ee252f549a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	dev/skeletons/skeleton_list.php
	htdocs/accountancy/class/html.formventilation.class.php
	htdocs/core/lib/cron.lib.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
 2016-10-01 18:42:50 +02:00
Laurent Destailleur
521008a698 FIX #5746 chrome php 
Try a fix. Not sure it solved all problems reported
 2016-10-01 17:27:52 +02:00
Laurent Destailleur
d079247b2b FIX #5813 Bug: Incoterms not being read correctly 2016-10-01 13:32:24 +02:00
Laurent Destailleur
d9ff53eb7f Fix travis errors 2016-09-30 15:22:58 +02:00
Laurent Destailleur
287f9972a8 Merge branch 'new_no_default_rights' of 
https://github.com/atm-maxime/dolibarr into
atm-maxime-new_no_default_rights

Conflicts:
	htdocs/langs/en_US/admin.lang
 2016-09-30 13:04:14 +02:00
Laurent Destailleur
94dbe3da3f Fix the info if module are provided by module or not was wrong 2016-09-30 13:02:13 +02:00
Laurent Destailleur
b412baa880 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-29 10:49:47 +02:00
Laurent Destailleur
214dc2cba0 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-09-29 10:49:00 +02:00
Laurent Destailleur
0b49d6316e Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-09-29 10:48:14 +02:00
gauthier
03d126810c FIX : "reopen " new right must respect advanced user rights management 2016-09-29 10:15:34 +02:00
Laurent Destailleur
4702fdc8d7 Merge pull request #5805 from simnandez/develop 
New: Add thirdparty extrafields to export thirdparty categories
 2016-09-28 20:25:04 +02:00
Laurent Destailleur
e99f115a8f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/install/mysql/tables/llx_user.sql
 2016-09-28 19:49:36 +02:00
Laurent Destailleur
bfd5bb37c5 Code comment 2016-09-28 18:07:31 +02:00
Juanjo Menent
b99b97573d New: Add thirdparty extrafields to export thirdparty categories 2016-09-28 10:53:22 +02:00
Juanjo Menent
30050b51f0 FIX: Failed to export contact categories with contact extra fields 2016-09-28 10:15:41 +02:00
gauthier
ad03bdf3b9 FIX : reopen invoice is an advanced right and default value is 1 2016-09-26 17:39:46 +02:00
aspangaro
2dbeeedd14 Move tab menu for subscription in member.lib 
Move all pages for subscription member in adherent/subscription (Card / Info / List)
Rename llx_cotisation in llx_subscription
Rename all db field cotisation in subscription
Rename class Cotisation in class Subscription
 2016-09-24 06:48:40 +02:00
gauthier
7ad2fda289 NEW : Reopen a paid bill is a user right 2016-09-22 15:06:39 +02:00
Laurent Destailleur
f1166f1898 Fix warning 2016-09-22 13:00:02 +02:00
Laurent Destailleur
d598e206cd Fix warning 2016-09-22 12:56:48 +02:00
Laurent Destailleur
619b65e0b6 Fix warning 2016-09-22 11:06:39 +02:00
Laurent Destailleur
95f2cae825 Start to work on sepa mandate generation 2016-09-19 00:26:30 +02:00
Laurent Destailleur
5ea9fc7467 NEW Support extrafields on product lot. 2016-09-12 17:27:44 +02:00
Laurent Destailleur
03c312e35c Fix bad name for modules_action.php 2016-09-10 16:09:46 +02:00
Laurent Destailleur
858291c3a3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-09 09:32:51 +02:00
Laurent Destailleur
0debcf745a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
 2016-09-09 09:32:14 +02:00
Laurent Destailleur
417b2f566f FIX Translation of "Name" is not a good choice for floow-up. 2016-09-08 17:31:42 +02:00
Raphaël Doursenaud
d89a877a00 Added the new familyinfo property from 4.0.0 2016-09-08 16:58:01 +02:00
Raphaël Doursenaud
f97f011cd3 Added missing properties in modules class. 
Enhanced modules class documentation.
 2016-09-08 16:37:48 +02:00
Raphaël Doursenaud
4126928804 Fixed code discrepancy 
Most places and samples used editor_url so I opted for that.
 2016-09-08 16:37:45 +02:00
Laurent Destailleur
5aaa3028a2 FIX Better position of fields in expense report PDF. 2016-09-07 01:47:09 +02:00
Laurent Destailleur
cc9230c07f FIX Columns truncated and translation missing 2016-09-06 13:08:49 +02:00
Laurent Destailleur
8419202588 NEW Support free bottom text and watermark on expense report template 2016-09-06 12:47:18 +02:00
Laurent Destailleur
571aae7026 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-09-02 21:52:20 +02:00
Laurent Destailleur
0e4b4ee321 Merge branch 'develop-external-logging' of 
https://github.com/GPCsolutions/dolibarr into
GPCsolutions-develop-external-logging

Conflicts:
	composer.json
 2016-09-02 21:51:25 +02:00
Laurent Destailleur
b01d1979f8 Merge pull request #5680 from aspangaro/5.0-p7 
NEW: Move Expense report menu from module to menu files (Again)
 2016-09-02 18:39:49 +02:00
Laurent Destailleur
e62299d67e NEW Add date into list of print jobs for Google Print. 2016-08-31 14:36:08 +02:00
Laurent Destailleur
524dd79198 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/bank/search.php
	htdocs/core/class/html.form.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/tasks/time.php
 2016-08-31 00:16:07 +02:00
aspangaro
b5f093436e NEW: Move Expense report menu from module to menu files (Again) 2016-08-30 21:43:17 +02:00
Laurent Destailleur
6ddd264178 Fix not used field 2016-08-28 17:45:20 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
Laurent Destailleur
1fc5715040 Fix date of contract not used 2016-08-20 00:30:09 +02:00
Laurent Destailleur
69e6f6a489 Merge pull request #5608 from aspangaro/4.0-p40 
Fix: Some problems on export with language
 2016-08-17 15:54:36 +02:00
Laurent Destailleur
ba8c2dbf9f Fix order of module for demo. 2016-08-17 11:39:11 +02:00
Laurent Destailleur
47489265b1 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0 2016-08-17 11:15:30 +02:00
Raphaël Doursenaud
49cb61b530 CLOSE #5627 Allowed external logging modules. 
Removed Sentry logging.
 2016-08-16 03:24:04 +02:00
Laurent Destailleur
7cc7ac5485 Fix translation 2016-08-11 17:41:09 +02:00