Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
85,691 Commits 36 Branches 189 Tags
042fb4641fe2f437be6721e29bcc8c8d83862b1f
Commit Graph

3713 Commits

Author SHA1 Message Date
Laurent Destailleur
042fb4641f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/de_DE/install.lang
	htdocs/langs/de_DE/main.lang
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cashdesk.lang
	htdocs/langs/fr_FR/errors.lang
	htdocs/langs/fr_FR/projects.lang
 2020-04-21 18:33:11 +02:00
Laurent Destailleur
f670a68b04 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/mails.php
 2020-04-21 18:29:50 +02:00
Laurent Destailleur
f6735ce8f2 Update repair.sql script 2020-04-21 14:28:52 +02:00
Laurent Destailleur
f816fae86c Fix a duplicated index 2020-04-20 12:21:13 +02:00
Laurent Destailleur
16806da9b5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-18 15:49:56 +02:00
Laurent Destailleur
f0f28c83cd Add fk 2020-04-18 15:49:40 +02:00
Laurent Destailleur
f6e77fc0ba Merge pull request #13602 from oscim/patch-37 
Update llx_commandedet.key.sql
 2020-04-18 15:48:53 +02:00
Laurent Destailleur
e050429854 Update llx_commandedet.key.sql 2020-04-18 15:48:45 +02:00
ATM john
c334a931de Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-04-16 20:29:54 +02:00
Laurent Destailleur
619014726e Fix char of account of us 2020-04-16 17:19:18 +02:00
Frederick Jost Zweig
49d5469904 Added basic charts of accounts for USA and Canada. 2020-04-15 13:29:51 +03:00
ATM john
b70cd84402 Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-04-14 14:11:12 +02:00
oscim
f4c346cdbb Update llx_commandedet.key.sql 
add external key
 2020-04-14 07:48:34 +02:00
Laurent Destailleur
52b467d2fc FIX #13550 Removed not used table 2020-04-12 19:06:44 +02:00
Laurent Destailleur
51eea01505 Merge pull request #13584 from pstructures/develop 
Installation issue
 2020-04-12 16:38:08 +02:00
Matt Sidnell
7c72e40659 Installation issue 
Installation SQL issue due to a ';' instead of a ','.
 2020-04-12 15:21:14 +01:00
Frédéric FRANCE
33a926e251 Update llx_categorie_website_page.key.sql 2020-04-12 09:08:27 +02:00
Laurent Destailleur
6a955da4e9 Merge pull request #13546 from oscim/patch-33 
Update llx_societe.key.sql
 2020-04-11 01:31:29 +02:00
Laurent Destailleur
47f00f8bc8 Update llx_societe.key.sql 
Keep only fields that are enough discriminent for new indexes
 2020-04-11 01:31:03 +02:00
Laurent Destailleur
eb3ed7ffdf Complete index on tickets 2020-04-10 20:02:57 +02:00
Laurent Destailleur
6960f79e40 Update llx_ticket.key.sql 2020-04-10 19:59:45 +02:00
philazerty
0aab98abff Index optimization for ticket 
When there are a lot of tickets, the search can be long without these indexes.
 2020-04-10 17:05:53 +02:00
Laurent Destailleur
5ff981bf61 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/user/perms.php
 2020-04-10 12:04:21 +02:00
Laurent Destailleur
874cbcefc7 Fix permission to close a proposal or order was not correctly used 
#13547
 2020-04-10 11:54:14 +02:00
Laurent Destailleur
8567001a46 Merge pull request #13549 from oscim/patch-34 
Update llx_societe_rib.key.sql
 2020-04-10 11:11:13 +02:00
oscim
2887ae3f00 Update llx_societe_rib.key.sql 
fix key in table
 2020-04-10 08:54:39 +02:00
oscim
2df7d79421 Update llx_societe.key.sql 
Add index in table for optimise search in big database
 2020-04-09 15:54:25 +02:00
Laurent Destailleur
87ff94fc64 Add generic fields 2020-04-05 03:59:23 +02:00
Laurent Destailleur
8454598722 WIP Add tables to manage categories of website pages. 2020-04-04 18:59:26 +02:00
Laurent Destailleur
9849afd3dd WIP Add tables to manage categories of website pages. 2020-04-04 18:53:38 +02:00
Laurent Destailleur
237615aa71 Fix offset for ecuador must be ID of country so 84 + 5 zeros 2020-04-03 02:35:55 +02:00
Laurent Destailleur
b669aca1a0 Merge pull request #13483 from fabianpc/db_ecuador 
NEW : Chart of accounts to Ecuador
 2020-04-03 02:32:30 +02:00
Laurent Destailleur
99ddd25ad5 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-04-02 16:51:50 +02:00
Laurent Destailleur
3408f67348 Clean orhpelins in llx_product_association 2020-04-02 16:00:09 +02:00
Laurent Destailleur
c225f35eff Update 11.0.0-12.0.0.sql 2020-04-02 12:49:20 +02:00
Christian Foellmann
6aa65f1a02 change batches max length to 128 characters on sql migration 2020-04-01 09:57:51 +02:00
Laurent Destailleur
6f0071bebe FIX sort on company on member list 2020-03-31 17:54:48 +02:00
Fabian Palacios
ae4fb855d7 chart of accounts to Ecuador 2020-03-31 10:10:22 -05:00
Fabian Palacios
db18226493 Chart of accounts to Ecuador 2020-03-31 10:08:37 -05:00
ATM john
035bb671f2 Fix sql ; missing 2020-03-31 16:32:07 +02:00
ATM john
c466beea3d Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-03-31 16:28:43 +02:00
Laurent Destailleur
be3cc164c6 Increase size for unalterable logs record. 2020-03-30 18:41:21 +02:00
Laurent Destailleur
398812afa5 Add field to store version of encoding of line in blockedlog 2020-03-30 17:47:29 +02:00
Laurent Destailleur
c27592bad2 Clean deprecated params on all fetch_optionals() 2020-03-27 16:02:58 +01:00
Laurent Destailleur
fa3bba942f Start to save the VAT src code into table of discounts to reuse them 
later
 2020-03-26 02:01:30 +01:00
Laurent Destailleur
e937b22721 Increase batch number to 128 2020-03-25 19:34:52 +01:00
Alexandre SPANGARO
89de39f199 Move supplier proposal menu to the core 2020-03-23 08:51:38 +01:00
Laurent Destailleur
226f4695cd Fix migration of type of field 2020-03-22 19:48:53 +01:00
Laurent Destailleur
8313ed9ee4 Merge pull request #13388 from OPEN-DSI/new-type-category-from-hook 
NEW add category type from hook
 2020-03-22 19:45:31 +01:00
Laurent Destailleur
7145754376 Can set different warehous, lot during production 2020-03-22 17:06:59 +01:00