lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,237 Commits 43 Branches 150 Tags 886 MiB
11704e0807
Commit Graph

46237 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marcos García de La Fuente
41e01a22a3 Fixed loading of external numeration modules in Contrat, Commande, Facture, Contrat, Expedition, Fichinter, CommandeFournisseur and uniformized code 2015-01-17 18:58:05 +01:00
Marcos García de La Fuente
ed839114ab Fixed loading of external numeration modules in FactureFournisseur and Propal 2015-01-17 18:42:19 +01:00
Marcos García de La Fuente
068045f6a0 Fix: [ bug #1803 ] AJAX company contact input is not aligned 2015-01-17 18:23:20 +01:00
Marcos García de La Fuente
a64084308d Fix: [ bug #1804 ] SQL error when sending email without addresee 2015-01-17 18:12:43 +01:00
Laurent Destailleur
06eda34b56 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-17 16:40:53 +01:00
Laurent Destailleur
9876b30387 Need more info to find bugs 2015-01-17 16:22:37 +01:00
Laurent Destailleur
007f18bcf7 Merge branch 'review' of https://github.com/GPCsolutions/dolibarr into 
GPCsolutions-review

Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
	htdocs/accountancy/journal/purchasesjournal.php
	htdocs/comm/action/peruser.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/accounting.lib.php
	htdocs/core/lib/report.lib.php
 2015-01-17 15:11:12 +01:00
Laurent Destailleur
eeeb6de8d9 Merge pull request #2020 from GPCsolutions/situationsinvoices 
Situations invoices support
 2015-01-17 14:44:05 +01:00
Laurent Destailleur
30abacd0a6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-01-17 14:42:42 +01:00
Laurent Destailleur
da269a15a3 Merge branch 'FHenry-develop_bank_extrafields' into develop 2015-01-17 14:42:23 +01:00
Laurent Destailleur
87a59ef527 Merge branch 'develop_bank_extrafields' of 
https://github.com/FHenry/dolibarr into FHenry-develop_bank_extrafields

Conflicts:
	htdocs/admin/bank.php
 2015-01-17 14:42:04 +01:00
Laurent Destailleur
8cd46e4830 Introduce option MAIN_HTML_TITLE to start to control format of html 
title content.
 2015-01-17 14:34:16 +01:00
Juanjo Menent
daf3df158d Merge pull request #2246 from frederic34/patch-1 
Typo
 2015-01-17 01:40:10 +01:00
Frédéric FRANCE
a7d263c14e Typo 2015-01-16 23:34:10 +01:00
frederic34
52a1e8a0f3 Merge remote branch 'upstream/develop' into custom 
Conflicts:
	htdocs/custom/.gitignore
 2015-01-16 23:09:43 +01:00
Juanjo Menent
26e5efd71d Improve code create function 2015-01-16 23:09:13 +01:00
Juanjo Menent
93d3ffb06f Fix: PostgreSQL compatibilty 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2015-01-16 18:03:55 +01:00
Juanjo Menent
0d4aad4111 Fix: PostgreSQL compatibilty 
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
 2015-01-16 17:59:58 +01:00
Juanjo Menent
fe5533d1c3 Fix: PostgreSQL compatibilty 2015-01-16 17:41:56 +01:00
Laurent Destailleur
6a900598a3 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-01-16 15:13:48 +01:00
Laurent Destailleur
41890d0a0b Fixed: Translation of module name and desc was not used for external 
modules.
 2015-01-16 14:38:00 +01:00
Laurent Destailleur
d1a0187f82 Merge pull request #2236 from marcosgdf/translations 
Corrected translation typos
 2015-01-16 12:10:32 +01:00
Laurent Destailleur
c5df4fd9b8 Merge pull request #2240 from genezys/develop 
Add support for configurable first day of week
 2015-01-16 12:09:21 +01:00
Laurent Destailleur
6a081fe883 Merge pull request #2229 from frederic34/getnextvalue 
Translation error messages numbering modules
 2015-01-16 12:08:53 +01:00
Laurent Destailleur
767afd3c9f Merge pull request #2231 from KreizIT/fix_cron 
Fix cron
 2015-01-16 12:08:30 +01:00
Laurent Destailleur
5087ac8153 Merge pull request #2237 from marcosgdf/bug-1797 
Fix:  [ bug #1797 ] Tulip Supplier invoice module takes creation date instead of invoice date
 2015-01-16 12:08:09 +01:00
Laurent Destailleur
6f00cecd81 Merge pull request #2244 from KreizIT/fix_default_empty 
FIX : Creating default object from empty when validating supplier order
 2015-01-16 12:03:23 +01:00
Laurent Destailleur
4c8de74140 Merge pull request #2242 from marcosgdf/3.6 
Fix: [ bug #1801 ] FAC_FORCE_DATE_VALIDATION constant alters supplier invoice date given to numeration modules
 2015-01-16 12:02:24 +01:00
Laurent Destailleur
c54355b63a Merge remote-tracking branch 'origin/3.7' into develop 2015-01-16 10:44:41 +01:00
KreizIT
a9008c4993 Fix Creating default object from empty on supplier order confirmation 2015-01-15 17:40:15 +01:00
frederic34
2396ba833c Ignore content of directory custom 2015-01-15 17:36:13 +01:00
Cedric
999a6052ff FIX : Creating default object from empty when validating supplier order 2015-01-15 16:23:10 +01:00
Marcos García de La Fuente
61809ef6b5 - Fix: [ bug #1802 ] SQL error when updating a task with PostgreSQL database 2015-01-15 13:22:58 +01:00
Marcos García de La Fuente
88c3509dd0 Merge remote-tracking branch 'upstream/3.6' into 3.6 
Conflicts:
	ChangeLog
 2015-01-15 13:09:23 +01:00
Marcos García de La Fuente
71b609fab0 Fix: [ bug #1801 ] FAC_FORCE_DATE_VALIDATION constant alters supplier invoice date given to numeration modules 2015-01-15 13:08:33 +01:00
Vincent Robert
eb90e0124e Add support for configurable first day of week 
- Force loading of database configuration to retrieve the first day of week
- Order the day titles based on first day of week
- Change layout based on first day of week

Conflicts:
	htdocs/core/datepicker.php
 2015-01-15 12:43:13 +01:00
Juanjo Menent
1930d0677e Fix: withdrawal create error if in the same month are deleted previus 
withdrawals.

Conflicts:
	ChangeLog
 2015-01-15 10:02:42 +01:00
Juanjo Menent
f03ffaf5a3 Fix: withdrawal create error if in the same month are deleted previus 
withdrawals.

Conflicts:
	ChangeLog
 2015-01-15 10:00:52 +01:00
Juanjo Menent
d40eab2494 Fix: withdrawal create error if in the same month are deleted previus 
withdrawals.
 2015-01-15 09:57:20 +01:00
Laurent Destailleur
e20c1decdf Fixed: object instead of soc and vis versa. 2015-01-15 03:51:47 +01:00
Laurent Destailleur
c5a3b4481e Fixed: use object 2015-01-15 03:11:06 +01:00
Laurent Destailleur
d16ce7eb96 Fix: Bad var 2015-01-15 02:42:41 +01:00
Laurent Destailleur
362167f319 Fixed: Export was not using user assigned 2015-01-15 02:32:15 +01:00
Laurent Destailleur
4d67e6f4d4 Add ignore 2015-01-15 02:11:22 +01:00
Laurent Destailleur
ccfbd3614e Not nice looking 2015-01-15 02:09:28 +01:00
Laurent Destailleur
ba49cce47a Fix: The filter into event views on user must be done on assigned 
resource, not only owner.
 2015-01-15 02:06:04 +01:00
Laurent Destailleur
68441a563a Fixed: Avoid space into address string 2015-01-14 19:17:58 +01:00
Laurent Destailleur
4c64b8ceae Add menu image 2015-01-14 19:12:22 +01:00
Laurent Destailleur
e3f3956bed Sec: Bad security test 2015-01-14 19:11:56 +01:00
Laurent Destailleur
1d1970b5a1 Sec: Bad security test 2015-01-14 19:10:48 +01:00