lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
66,278 Commits 43 Branches 150 Tags 886 MiB
6e288fca75
Commit Graph

66278 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
6e288fca75
Merge pull request #8575 from all3kcis/develop-patch-16 
NEW Add files management on products lot
 2018-04-13 00:57:13 +02:00
Laurent Destailleur
3078b890d4 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/stripe/admin/stripe.php
 2018-04-13 00:45:39 +02:00
Laurent Destailleur
ecd18da137 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-13 00:43:37 +02:00
Laurent Destailleur
f7bb781b42 FIX #8571 2018-04-13 00:43:15 +02:00
Laurent Destailleur
2fadfe4b6e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-13 00:42:20 +02:00
Laurent Destailleur
519ee64c1f Translation 2018-04-13 00:42:08 +02:00
Laurent Destailleur
2bbde44f63 FIX #8580 2018-04-12 23:54:53 +02:00
Laurent Destailleur
d530337bdc
Merge pull request #8579 from hregis/develop_ldap 
Fix: wrong permissions
 2018-04-12 23:51:37 +02:00
Laurent Destailleur
7bf9801b80
Merge pull request #8577 from atm-florian/6.0 
fix error on first install pgsql
 2018-04-12 23:47:10 +02:00
Laurent Destailleur
341d1efb11 Fix clear filter must not lose type 2018-04-12 23:42:06 +02:00
Laurent Destailleur
ce402abda2 Debut ticket module 2018-04-12 23:33:38 +02:00
Laurent Destailleur
ace55ba569 Debug usage of extrafields for ticket module 2018-04-12 23:17:46 +02:00
Laurent Destailleur
3cecfd02c7 NEW Mutualize code for action="update_extras" 
NEW Can use setValueFrom without user modification field
FIX Exclude separators from mandatory extrafields test
More code to use the new framework array for extrafields
Can use text condition in extrafield visibility
 2018-04-12 23:16:23 +02:00
Laurent Destailleur
1c9661d9d6 FIX Update incoterm on supplier invoice 2018-04-12 21:39:12 +02:00
Laurent Destailleur
664f57a5f0 Clean code 2018-04-12 19:13:06 +02:00
Regis Houssin
ee61324caf Fix: show \r\n if description contain <br> 2018-04-12 18:57:51 +02:00
Laurent Destailleur
4b38cf5329 Fix request at wrong place 2018-04-12 18:30:07 +02:00
Regis Houssin
bd95e5265e Fix: wrong permissions 2018-04-12 18:05:12 +02:00
Laurent Destailleur
421a794942 FIX #8559 Bug to generate cheque receipt 2018-04-12 17:22:51 +02:00
All-3kcis
c35b454455 Fix bug productlot created without entity 2018-04-12 17:13:42 +02:00
All-3kcis
f1d1fdf951 Fix bug when entity=null on DB 2018-04-12 17:11:02 +02:00
florian HENRY
cd2f6616be fix index creation with unique name for pgSQL 2018-04-12 16:41:53 +02:00
florian HENRY
def28be0ab fix error on first install pgsql 2018-04-12 16:36:04 +02:00
All-3kcis
21df700325 Add option to save file with product batch ref 
+ use batch number like ref instead of id
+ debug access to shared link
 2018-04-12 15:55:08 +02:00
All-3kcis
a8fbf4a370 Add option to save file with product ref 2018-04-12 15:40:09 +02:00
All-3kcis
880fa55dd5 display user-friendly filesize 2018-04-12 15:29:22 +02:00
Laurent Destailleur
ba7d3ee97b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-12 15:17:26 +02:00
Laurent Destailleur
a8878c3f7e FIX #6295 2018-04-12 15:17:15 +02:00
All-3kcis
f7e58f3c73 Add files management on products lot 2018-04-12 15:10:37 +02:00
Laurent Destailleur
9f00cf1ae1
Merge pull request #8572 from Dolibarr/add-code-of-conduct-1 
Create CODE_OF_CONDUCT.md
 2018-04-12 13:38:05 +02:00
Laurent Destailleur
d35c7554ca
Create CODE_OF_CONDUCT.md 2018-04-12 13:37:43 +02:00
Laurent Destailleur
dd022ee423 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-04-12 13:31:38 +02:00
Laurent Destailleur
ea2fd67e0d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/langs/de_DE/admin.lang
 2018-04-12 13:31:14 +02:00
Laurent Destailleur
e437989853 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-12 13:25:27 +02:00
Laurent Destailleur
19b5403cd9
Merge pull request #8568 from aspangaro/8.0-a18 
Accountancy - Small fix
 2018-04-12 13:19:39 +02:00
Laurent Destailleur
72092e7b6b
Update README-FR.md 2018-04-12 13:08:09 +02:00
Laurent Destailleur
413f234fba
Update README.md 2018-04-12 13:07:37 +02:00
Laurent Destailleur
5f5beb9cfb
Update README.md 2018-04-12 12:30:31 +02:00
Laurent Destailleur
97c30e7693
Update README.md 2018-04-12 12:25:13 +02:00
Laurent Destailleur
baa716dac1
Update README-FR.md 2018-04-12 12:23:50 +02:00
Laurent Destailleur
bdf8863e56
Update README-FR.md 2018-04-12 12:21:21 +02:00
Laurent Destailleur
9cf737cb46
Update README.md 2018-04-12 12:19:05 +02:00
Laurent Destailleur
4ea500c9fc
Merge pull request #8569 from monkeywithacupcake/patch-1 
Update README.md
 2018-04-12 12:15:54 +02:00
Laurent Destailleur
cca3604f34
Update README.md 2018-04-12 12:13:00 +02:00
Laurent Destailleur
34ce9a8aa1
Update README.md 2018-04-12 12:11:05 +02:00
Laurent Destailleur
2b16ee75cd Fix ref must be visible on combolist 2018-04-12 11:29:16 +02:00
Laurent Destailleur
07853b35aa Remove php5.3 from travis. PHP 5.3 no more supported with Dolibarr 8 2018-04-12 11:28:35 +02:00
jess
c143ac060b
Update README.md 
Hi, I'm making updates for Open Collective. Either you or a supporter signed this repo up for Open Collective. This pull request adds backers and sponsors from your Open Collective https://opencollective.com/dolibarr ❤️

It adds two badges at the top to show the latest number of backers and sponsors. It also adds placeholders so that the avatar/logo of new backers/sponsors can automatically be shown without having to update your README.md. [more info](https://github.com/opencollective/opencollective/wiki/Github-banner). See how it looks on [this repo](https://github.com/apex/apex#backers).

You can also add a "Donate" button to your website and automatically show your backers and sponsors there with our widgets. Have a look here: https://opencollective.com/widgets

P.S: As with any pull request, feel free to comment or suggest changes. The only thing "required" are the placeholders on the README because we believe it's important to acknowledge the people in your community that are contributing (financially or with code!).

Thank you for your great contribution to the open source community. You are awesome! 🙌
And welcome to the open collective community! 😊

Come chat with us in the #opensource channel on https://slack.opencollective.com - great place to ask questions and share best practices with other open source sustainers!
 2018-04-12 14:09:31 +09:00
Alexandre SPANGARO
251117fcce Accountancy - Small fix 2018-04-12 06:07:22 +02:00
Laurent Destailleur
8da84af973 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-04-11 19:31:48 +02:00