Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-21 00:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
102,849 Commits 36 Branches 190 Tags
a94e39f0f47cd3e7fa8a6496bd023df1b81eec1f
Commit Graph

1956 Commits

Author SHA1 Message Date
Alexis Algoud
91885c9d6f FIX when multicompany was enabled, this function didn't check just on the good entity (problem when both company use same mask) 2015-05-22 17:22:57 +02:00
Laurent Destailleur
6f5a30638c NEW On page to see/edit contact of an ojbect, the status of contact is 
visible (for both external and internal users).
 2015-05-22 12:21:36 +02:00
Laurent Destailleur
afc487ef9d Fix phpcs 2015-05-07 13:28:03 +02:00
Laurent Destailleur
4ce4529cd5 Revert "Remove useless variables for common object" 
This reverts commit 82682dfc66.
 2015-05-05 22:09:58 +02:00
jfefe
82682dfc66 Remove useless variables for common object 
Fields name / civility / ... are nonsense for a lot of objects into Dolibarr.
They could be defined for each object instead of into the common object class.
This for the API which exposes a property civility for a category :\
 2015-05-05 01:13:49 +02:00
Laurent Destailleur
c485b1fe30 Fix When generation of doc is required and generator not provided, we 
take first entry found.
 2015-05-03 20:07:16 +02:00
Laurent Destailleur
414404e854 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/class/commonobject.class.php
 2015-04-26 16:30:33 +02:00
Juanjo Menent
f7ab53be8e Fix test for es. Dumps 3.5 et 3.6 2015-04-22 23:40:43 +02:00
Juanjo Menent
1ed573f98b Fix: #2694 Bug: Warning: Invalid argument supplied for foreach() in 
commande.class.php on line 852
 2015-04-22 23:31:24 +02:00
Laurent Destailleur
96a33bbe8a First clean of code after devcamp 2015-04-21 15:49:58 +02:00
Laurent Destailleur
9d1c609c4f Merge pull request #2538 from marcosgdf/units 
NEW [ task 977 ] New option to manage product unit Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
 2015-04-21 11:14:50 +02:00
Laurent Destailleur
94589b9935 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-04-19 23:15:39 +02:00
Laurent Destailleur
65dafeee55 Uniformize feature between invoice and merging tool 2015-04-19 23:15:24 +02:00
Marcos García de La Fuente
87f97ed545 Merge branch 'develop' into units 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/admin/product.php
	htdocs/product/card.php
 2015-04-18 23:38:14 +02:00
Marcos García de La Fuente
e2e6049c7f Copyright 2015-04-18 20:50:03 +02:00
Marcos García de La Fuente
c07e26dcac Merge branch 'develop' into fr-2613 
Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-04-18 20:42:57 +02:00
Marcos García de La Fuente
dc790ff586 NEW: Feature request: A page to merge two thirdparties into one #2613 2015-04-18 20:41:09 +02:00
jfefe
f2e19f2326 Fix: error when deleting resource 2015-04-18 18:07:59 +02:00
Laurent Destailleur
56a14da5d4 FIXME that are not bug are replaced with TODO 
Add control on batch movement (lot/serial is mandatory, and control
eatby and sellby are same for each lot/serial)
 2015-04-12 04:01:28 +02:00
Laurent Destailleur
c4daca2bac Fix #1682 2015-04-08 21:34:04 +02:00
aspangaro
03b1db138e Debug 2015-04-06 08:20:23 +02:00
Marcos García de La Fuente
7075ac74c4 Merge branch 'develop' into units 
Conflicts:
	htdocs/comm/propal.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/card.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
	htdocs/contrat/class/contrat.class.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/tpl/objectline_create.tpl.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
	htdocs/product/class/product.class.php
 2015-04-03 15:45:54 +02:00
Marcos García de La Fuente
3d50b41b8e Reverted $rowid instead of $id property 2015-03-23 01:40:33 +01:00
Marcos García de La Fuente
4349f27299 Revert "Revert "Refactor 1"" 2015-03-23 01:39:12 +01:00
Laurent Destailleur
2d90256640 Revert "Refactor 1" 2015-03-22 12:51:29 +01:00
Laurent Destailleur
a79a779b04 Merge pull request #2456 from marcosgdf/refactor-1 
Refactor 1
 2015-03-22 12:47:05 +01:00
Laurent Destailleur
84bea6166e Doxygen 2015-03-17 10:55:45 +01:00
Laurent Destailleur
4fffeb3a89 Clean code 2015-03-17 10:52:27 +01:00
Laurent Destailleur
689d270552 Doxygen 2015-03-17 10:47:20 +01:00
Marcos García de La Fuente
6ba3b900b7 PHPCS Fix 2015-03-15 23:42:11 +01:00
Marcos García de La Fuente
086e439543 Merge branch 'develop' into refactor-1 
Conflicts:
	htdocs/core/tpl/objectline_view.tpl.php
 2015-03-15 18:16:55 +01:00
Marcos García de La Fuente
efb9f7f4fd Merge branch 'develop' into refactor-1 
Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/includes/tcpdi/fpdf_tpl.php
 2015-03-15 18:07:30 +01:00
Laurent Destailleur
10bbf463e7 Several bug fixes from scrutinizer 2015-03-14 14:55:41 +01:00
BENKE Charles
df9f822a70 Update commonobject.class.php 
new extafields type
 2015-03-14 12:25:17 +01:00
Laurent Destailleur
e8e2f65ae5 Debug virtual product interface 2015-03-11 14:55:45 +01:00
aspangaro
69dc3cdd61 Correct fk_statut & work en list 2015-03-08 08:21:49 +01:00
Laurent Destailleur
56b5bfd25b NEW: Implement option SUPPLIER_ORDER_USE_DISPATCH_STATUS to add a status 
into each dispathing line of supplier order to "verify" a
reception is ok. Status of order can be set to "total/done" only if line
is verified.
 2015-03-08 02:08:26 +01:00
Laurent Destailleur
049174b76f Fix bugs reported by https://scrutinizer-ci.com/g/Dolibarr/dolibarr/ 2015-03-06 01:53:02 +01:00
Laurent Destailleur
7b7b5090c7 Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into 
atm-ph-incoterm

Conflicts:
	htdocs/comm/propal.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 23:03:29 +01:00
Laurent Destailleur
96de912661 NEW: Add module "Supplier commercial proposals" to requests 
quotation/price to suppliers.
Merge branch 'new_ask_price' of https://github.com/atm-ph/dolibarr into
atm-ph-new_ask_price

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/tpl/document_actions_post_headers.tpl.php
	htdocs/core/tpl/objectline_edit.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-03-04 17:54:43 +01:00
Marcos García de La Fuente
f94f9d1e57 Removed $permtoedit variable 2015-03-04 11:19:45 +01:00
Marcos García de La Fuente
174f1cb5f7 Refactored supplier invoice line view to fit commonobjectline view 2015-03-04 10:37:47 +01:00
Marcos García de La Fuente
4c08d34bb5 Standardized $rowid as property 2015-03-04 10:37:46 +01:00
Laurent Destailleur
4c1d51bd39 phpcs 2015-03-04 02:28:16 +01:00
Marcos García de La Fuente
b4c84fac9d NEW: [ task #977 ] New option to manage product unit 
Migrated code from GPCSolutions/dolibarr:3.2-units branch and adapted for 3.8 with some improvements
 2015-03-01 12:42:38 +01:00
Laurent Destailleur
4d226885cb Rewrite code for supplier order and invoice to use shared code of 
customer supplier and invoice.
Work on extrafield for supplier order and invoice.
 2015-02-28 18:10:31 +01:00
Laurent Destailleur
ef14e4e7ed Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/fourn/class/fournisseur.product.class.php
 2015-02-28 03:11:15 +01:00
Laurent Destailleur
5d1545ad1f Work on supplier order and customer extrafields 
Use templates to show/edit supplier order and invoice lines
 2015-02-27 18:05:12 +01:00
Laurent Destailleur
828716420b Comment of function was not correct 2015-02-26 16:19:45 +01:00
Laurent Destailleur
daabc113a5 Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	README.md
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/cashjournal.php
 2015-02-26 13:36:07 +01:00